Skip to content

A
angle
Commit 12a8e866 by Corentin Wallez
Options

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
Showing with 199 additions and 203 deletions
samples/mip_map_2d/MipMap2D.cpp
...@@ -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)
{ {
} }
......
samples/multi_texture/MultiTexture.cpp
...@@ -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)
{ {
} }
......
samples/multi_window/MultiWindow.cpp
...@@ -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)
{ {
} }
......
samples/multiple_draw_buffers/MultipleDrawBuffers.cpp
...@@ -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)
{ {
} }
......
samples/particle_system/ParticleSystem.cpp
...@@ -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)
{ {
} }
......
samples/post_sub_buffer/PostSubBuffer.cpp
...@@ -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)
{ {
} }
......
samples/samples.gyp
...@@ -13,212 +13,200 @@ ...@@ -13,212 +13,200 @@
'include_dirs': [ '../include', ], 'include_dirs': [ '../include', ],
'sources': [ 'shader_translator/shader_translator.cpp' ], 'sources': [ 'shader_translator/shader_translator.cpp' ],
}, },
],
'conditions':
[
['OS=="win"',
{ {
'targets': 'target_name': 'sample_util',
'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ],
'dependencies':
[
'<(angle_path)/src/angle.gyp:libEGL',
'<(angle_path)/src/angle.gyp:libGLESv2',
'<(angle_path)/util/util.gyp:angle_util',
],
'export_dependent_settings':
[
'<(angle_path)/util/util.gyp:angle_util',
],
'include_dirs':
[ [
'<(angle_path)/include',
'sample_util',
],
'sources':
[
'sample_util/Matrix.cpp',
'sample_util/Matrix.h',
'sample_util/SampleApplication.cpp',
'sample_util/SampleApplication.h',
'sample_util/Vector.cpp',
'sample_util/Vector.h',
'sample_util/geometry_utils.cpp',
'sample_util/geometry_utils.h',
'sample_util/texture_utils.cpp',
'sample_util/texture_utils.h',
'sample_util/tga_utils.cpp',
'sample_util/tga_utils.h',
],
'conditions':
[
['OS=="linux"',
{ {
'target_name': 'sample_util', 'ldflags':
'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ],
'dependencies':
[
'<(angle_path)/src/angle.gyp:libEGL',
'<(angle_path)/src/angle.gyp:libGLESv2',
'<(angle_path)/util/util.gyp:angle_util',
],
'export_dependent_settings':
[
'<(angle_path)/util/util.gyp:angle_util',
],
'include_dirs':
[ [
'<(angle_path)/include', '-lX11'
'sample_util',
], ],
'sources': }],
[ ],
'sample_util/Matrix.cpp', 'msvs_disabled_warnings': [ 4201 ],
'sample_util/Matrix.h', 'direct_dependent_settings':
'sample_util/SampleApplication.cpp', {
'sample_util/SampleApplication.h', 'msvs_disabled_warnings': [ 4201 ],
'sample_util/Vector.cpp', 'include_dirs':
'sample_util/Vector.h', [
'sample_util/geometry_utils.cpp', 'sample_util',
'sample_util/geometry_utils.h', ],
'sample_util/texture_utils.cpp', },
'sample_util/texture_utils.h', },
'sample_util/tga_utils.cpp', {
'sample_util/tga_utils.h', 'target_name': 'hello_triangle',
], 'type': 'executable',
'msvs_disabled_warnings': [ 4201 ], 'dependencies': [ 'sample_util' ],
'direct_dependent_settings': 'includes': [ '../build/common_defines.gypi', ],
{ 'sources': [ 'hello_triangle/HelloTriangle.cpp', ],
'msvs_disabled_warnings': [ 4201 ], },
'include_dirs': {
[ 'target_name': 'mip_map_2d',
'sample_util', 'type': 'executable',
], 'dependencies': [ 'sample_util' ],
}, 'includes': [ '../build/common_defines.gypi', ],
}, 'sources': [ 'mip_map_2d/MipMap2D.cpp', ],
},
{ {
'target_name': 'hello_triangle', 'target_name': 'multi_texture',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'hello_triangle/HelloTriangle.cpp', ], 'sources': [ 'multi_texture/MultiTexture.cpp', ],
}, 'copies':
[
{
'target_name': 'mip_map_2d',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'mip_map_2d/MipMap2D.cpp', ],
},
{ {
'target_name': 'multi_texture', 'destination': '<(PRODUCT_DIR)',
'type': 'executable', 'files':
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'multi_texture/MultiTexture.cpp', ],
'copies':
[ [
{ 'multi_texture/basemap.tga',
'destination': '<(PRODUCT_DIR)', 'multi_texture/lightmap.tga',
'files': ],
[
'multi_texture/basemap.tga',
'multi_texture/lightmap.tga',
],
},
]
}, },
]
},
{ {
'target_name': 'multi_window', 'target_name': 'multi_window',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'multi_window/MultiWindow.cpp', ], 'sources': [ 'multi_window/MultiWindow.cpp', ],
}, },
{
'target_name': 'multiple_draw_buffers',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'multiple_draw_buffers/MultipleDrawBuffers.cpp', ],
'copies':
[
{ {
'target_name': 'multiple_draw_buffers', 'destination': '<(PRODUCT_DIR)',
'type': 'executable', 'files':
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'multiple_draw_buffers/MultipleDrawBuffers.cpp', ],
'copies':
[ [
{ 'multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl',
'destination': '<(PRODUCT_DIR)', 'multiple_draw_buffers/multiple_draw_buffers_fs.glsl',
'files': 'multiple_draw_buffers/multiple_draw_buffers_vs.glsl',
[ ],
'multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl', }
'multiple_draw_buffers/multiple_draw_buffers_fs.glsl', ]
'multiple_draw_buffers/multiple_draw_buffers_vs.glsl', },
],
}
]
},
{
'target_name': 'particle_system',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'particle_system/ParticleSystem.cpp', ],
'copies':
[
{ {
'target_name': 'particle_system', 'destination': '<(PRODUCT_DIR)',
'type': 'executable', 'files':
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'particle_system/ParticleSystem.cpp', ],
'copies':
[ [
{ 'particle_system/smoke.tga',
'destination': '<(PRODUCT_DIR)', ],
'files': }
[ ]
'particle_system/smoke.tga', },
], {
} 'target_name': 'post_sub_buffer',
] 'type': 'executable',
}, 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
{ 'sources': [ 'post_sub_buffer/PostSubBuffer.cpp', ],
'target_name': 'post_sub_buffer', },
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'post_sub_buffer/PostSubBuffer.cpp', ],
},
{
'target_name': 'simple_instancing',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'simple_instancing/SimpleInstancing.cpp', ],
},
{ {
'target_name': 'simple_texture_2d', 'target_name': 'simple_instancing',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'simple_texture_2d/SimpleTexture2D.cpp', ], 'sources': [ 'simple_instancing/SimpleInstancing.cpp', ],
}, },
{ {
'target_name': 'simple_texture_cubemap', 'target_name': 'simple_texture_2d',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'simple_texture_cubemap/SimpleTextureCubemap.cpp', ], 'sources': [ 'simple_texture_2d/SimpleTexture2D.cpp', ],
}, },
{ {
'target_name': 'simple_vertex_shader', 'target_name': 'simple_texture_cubemap',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'simple_vertex_shader/SimpleVertexShader.cpp', ], 'sources': [ 'simple_texture_cubemap/SimpleTextureCubemap.cpp', ],
}, },
{ {
'target_name': 'stencil_operations', 'target_name': 'stencil_operations',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'stencil_operations/StencilOperations.cpp', ], 'sources': [ 'stencil_operations/StencilOperations.cpp', ],
}, },
{ {
'target_name': 'tex_redef_microbench', 'target_name': 'tex_redef_microbench',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'tex_redef_microbench/TexRedefMicroBench.cpp', ], 'sources': [ 'tex_redef_microbench/TexRedefMicroBench.cpp', ],
}, },
{ {
'target_name': 'texture_wrap', 'target_name': 'texture_wrap',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'texture_wrap/TextureWrap.cpp', ], 'sources': [ 'texture_wrap/TextureWrap.cpp', ],
}, },
{ {
'target_name': 'tri_fan_microbench', 'target_name': 'tri_fan_microbench',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'tri_fan_microbench/TriFanMicroBench.cpp', ], 'sources': [ 'tri_fan_microbench/TriFanMicroBench.cpp', ],
}, },
],
}
],
], ],
} }
samples/simple_instancing/SimpleInstancing.cpp
...@@ -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)
{ {
} }
......
samples/simple_texture_2d/SimpleTexture2D.cpp
...@@ -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)
{ {
} }
......
samples/simple_texture_cubemap/SimpleTextureCubemap.cpp
...@@ -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)
{ {
} }
......
samples/simple_vertex_shader/SimpleVertexShader.cpp
...@@ -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)
{ {
} }
......
samples/stencil_operations/StencilOperations.cpp
...@@ -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)
{ {
} }
......
samples/tex_redef_microbench/TexRedefMicroBench.cpp
...@@ -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)
{ {
......
samples/texture_wrap/TextureWrap.cpp
...@@ -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)
{ {
} }
......
samples/tri_fan_microbench/TriFanMicroBench.cpp
...@@ -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