Commit 12a8e866 by Corentin Wallez

Make all the samples compile under Linux

Two-thirds of them run and work well. BUG=angleproject:892 Change-Id: I401a7ef4fd055eda7276bd34dcf0fc6ae0deff13 Reviewed-on: https://chromium-review.googlesource.com/270124Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent eaa759c4
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
class MipMap2DSample : public SampleApplication class MipMap2DSample : public SampleApplication
{ {
public: public:
MipMap2DSample::MipMap2DSample() MipMap2DSample()
: SampleApplication("MipMap2D", 1280, 720) : SampleApplication("MipMap2D", 1280, 720)
{ {
} }
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
class MultiTextureSample : public SampleApplication class MultiTextureSample : public SampleApplication
{ {
public: public:
MultiTextureSample::MultiTextureSample() MultiTextureSample()
: SampleApplication("MultiTexture", 1280, 720) : SampleApplication("MultiTexture", 1280, 720)
{ {
} }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
class MultiWindowSample : public SampleApplication class MultiWindowSample : public SampleApplication
{ {
public: public:
MultiWindowSample::MultiWindowSample() MultiWindowSample()
: SampleApplication("MultiWindow", 256, 256) : SampleApplication("MultiWindow", 256, 256)
{ {
} }
......
...@@ -18,12 +18,13 @@ ...@@ -18,12 +18,13 @@
#include "path_utils.h" #include "path_utils.h"
#include "texture_utils.h" #include "texture_utils.h"
#include <cstring>
#include <iostream> #include <iostream>
class MultipleDrawBuffersSample : public SampleApplication class MultipleDrawBuffersSample : public SampleApplication
{ {
public: public:
MultipleDrawBuffersSample::MultipleDrawBuffersSample() MultipleDrawBuffersSample()
: SampleApplication("MultipleDrawBuffers", 1280, 720) : SampleApplication("MultipleDrawBuffers", 1280, 720)
{ {
} }
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
class ParticleSystemSample : public SampleApplication class ParticleSystemSample : public SampleApplication
{ {
public: public:
ParticleSystemSample::ParticleSystemSample() ParticleSystemSample()
: SampleApplication("ParticleSystem", 1280, 720) : SampleApplication("ParticleSystem", 1280, 720)
{ {
} }
......
...@@ -19,12 +19,14 @@ ...@@ -19,12 +19,14 @@
#include "geometry_utils.h" #include "geometry_utils.h"
#include "Vector.h" #include "Vector.h"
#include "Matrix.h" #include "Matrix.h"
#include <cmath>
#include <iostream> #include <iostream>
class PostSubBufferSample : public SampleApplication class PostSubBufferSample : public SampleApplication
{ {
public: public:
PostSubBufferSample::PostSubBufferSample() PostSubBufferSample()
: SampleApplication("PostSubBuffer", 1280, 720) : SampleApplication("PostSubBuffer", 1280, 720)
{ {
} }
......
...@@ -18,13 +18,14 @@ ...@@ -18,13 +18,14 @@
#include "shader_utils.h" #include "shader_utils.h"
#include "texture_utils.h" #include "texture_utils.h"
#include <cstring>
#include <iostream> #include <iostream>
#include <vector> #include <vector>
class SimpleInstancingSample : public SampleApplication class SimpleInstancingSample : public SampleApplication
{ {
public: public:
SimpleInstancingSample::SimpleInstancingSample() SimpleInstancingSample()
: SampleApplication("SimpleInstancing", 1280, 720) : SampleApplication("SimpleInstancing", 1280, 720)
{ {
} }
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
class SimpleTexture2DSample : public SampleApplication class SimpleTexture2DSample : public SampleApplication
{ {
public: public:
SimpleTexture2DSample::SimpleTexture2DSample() SimpleTexture2DSample()
: SampleApplication("SimpleTexture2D", 1280, 720) : SampleApplication("SimpleTexture2D", 1280, 720)
{ {
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
class SimpleTextureCubemapSample : public SampleApplication class SimpleTextureCubemapSample : public SampleApplication
{ {
public: public:
SimpleTextureCubemapSample::SimpleTextureCubemapSample() SimpleTextureCubemapSample()
: SampleApplication("SimpleTextureCubemap", 1280, 720) : SampleApplication("SimpleTextureCubemap", 1280, 720)
{ {
} }
......
...@@ -20,10 +20,12 @@ ...@@ -20,10 +20,12 @@
#include "Vector.h" #include "Vector.h"
#include "Matrix.h" #include "Matrix.h"
#include <cmath>
class SimpleVertexShaderSample : public SampleApplication class SimpleVertexShaderSample : public SampleApplication
{ {
public: public:
SimpleVertexShaderSample::SimpleVertexShaderSample() SimpleVertexShaderSample()
: SampleApplication("SimpleVertexShader", 1280, 720) : SampleApplication("SimpleVertexShader", 1280, 720)
{ {
} }
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
class StencilOperationsSample : public SampleApplication class StencilOperationsSample : public SampleApplication
{ {
public: public:
StencilOperationsSample::StencilOperationsSample() StencilOperationsSample()
: SampleApplication("StencilOperations", 1280, 720) : SampleApplication("StencilOperations", 1280, 720)
{ {
} }
......
...@@ -13,12 +13,13 @@ ...@@ -13,12 +13,13 @@
// URLs: http://safari.informit.com/9780321563835 // URLs: http://safari.informit.com/9780321563835
// http://www.opengles-book.com // http://www.opengles-book.com
#include <iostream>
#include "SampleApplication.h" #include "SampleApplication.h"
#include "shader_utils.h" #include "shader_utils.h"
#include "texture_utils.h" #include "texture_utils.h"
#include <cstring>
#include <iostream>
// This sample demonstrates the differences in rendering efficiency when // This sample demonstrates the differences in rendering efficiency when
// drawing with already-created textures whose dimensions have been altered // drawing with already-created textures whose dimensions have been altered
// versus drawing with newly created textures. // versus drawing with newly created textures.
...@@ -45,7 +46,7 @@ ...@@ -45,7 +46,7 @@
class TexRedefBenchSample : public SampleApplication class TexRedefBenchSample : public SampleApplication
{ {
public: public:
TexRedefBenchSample::TexRedefBenchSample() TexRedefBenchSample()
: SampleApplication("Microbench", 1280, 1280), : SampleApplication("Microbench", 1280, 1280),
mFrameCount(0), mPixelsResize(NULL), mPixelsNewTex(NULL), mTimeFrame(false) mFrameCount(0), mPixelsResize(NULL), mPixelsNewTex(NULL), mTimeFrame(false)
{ {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
class TextureWrapSample : public SampleApplication class TextureWrapSample : public SampleApplication
{ {
public: public:
TextureWrapSample::TextureWrapSample() TextureWrapSample()
: SampleApplication("TextureWrap", 1280, 720) : SampleApplication("TextureWrap", 1280, 720)
{ {
} }
......
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
// URLs: http://safari.informit.com/9780321563835 // URLs: http://safari.informit.com/9780321563835
// http://www.opengles-book.com // http://www.opengles-book.com
#include <iostream>
#include "SampleApplication.h" #include "SampleApplication.h"
#include "shader_utils.h" #include "shader_utils.h"
#include <cstring>
#include <iostream>
// This small sample compares the per-frame render time for a series of // This small sample compares the per-frame render time for a series of
// squares drawn with TRIANGLE_FANS versus squares drawn with TRIANGLES. // squares drawn with TRIANGLE_FANS versus squares drawn with TRIANGLES.
// To exacerbate differences between the two, we use a large collection // To exacerbate differences between the two, we use a large collection
...@@ -26,7 +27,7 @@ ...@@ -26,7 +27,7 @@
class TriangleFanBenchSample : public SampleApplication class TriangleFanBenchSample : public SampleApplication
{ {
public: public:
TriangleFanBenchSample::TriangleFanBenchSample() TriangleFanBenchSample()
: SampleApplication("Microbench", 1280, 1280), : SampleApplication("Microbench", 1280, 1280),
mFrameCount(0) mFrameCount(0)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment