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 @@
class MipMap2DSample : public SampleApplication
{
public:
MipMap2DSample::MipMap2DSample()
MipMap2DSample()
: SampleApplication("MipMap2D", 1280, 720)
{
}
......
samples/multi_texture/MultiTexture.cpp
......@@ -21,7 +21,7 @@
class MultiTextureSample : public SampleApplication
{
public:
MultiTextureSample::MultiTextureSample()
MultiTextureSample()
: SampleApplication("MultiTexture", 1280, 720)
{
}
......
samples/multi_window/MultiWindow.cpp
......@@ -15,7 +15,7 @@
class MultiWindowSample : public SampleApplication
{
public:
MultiWindowSample::MultiWindowSample()
MultiWindowSample()
: SampleApplication("MultiWindow", 256, 256)
{
}
......
samples/multiple_draw_buffers/MultipleDrawBuffers.cpp
......@@ -18,12 +18,13 @@
#include "path_utils.h"
#include "texture_utils.h"
#include <cstring>
#include <iostream>
class MultipleDrawBuffersSample : public SampleApplication
{
public:
MultipleDrawBuffersSample::MultipleDrawBuffersSample()
MultipleDrawBuffersSample()
: SampleApplication("MultipleDrawBuffers", 1280, 720)
{
}
......
samples/particle_system/ParticleSystem.cpp
......@@ -26,7 +26,7 @@
class ParticleSystemSample : public SampleApplication
{
public:
ParticleSystemSample::ParticleSystemSample()
ParticleSystemSample()
: SampleApplication("ParticleSystem", 1280, 720)
{
}
......
samples/post_sub_buffer/PostSubBuffer.cpp
......@@ -19,12 +19,14 @@
#include "geometry_utils.h"
#include "Vector.h"
#include "Matrix.h"
#include <cmath>
#include <iostream>
class PostSubBufferSample : public SampleApplication
{
public:
PostSubBufferSample::PostSubBufferSample()
PostSubBufferSample()
: SampleApplication("PostSubBuffer", 1280, 720)
{
}
......
samples/samples.gyp
......@@ -13,212 +13,200 @@
'include_dirs': [ '../include', ],
'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',
'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':
'ldflags':
[
'<(angle_path)/include',
'sample_util',
'-lX11'
],
'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',
],
'msvs_disabled_warnings': [ 4201 ],
'direct_dependent_settings':
{
'msvs_disabled_warnings': [ 4201 ],
'include_dirs':
[
'sample_util',
],
},
},
{
'target_name': 'hello_triangle',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'hello_triangle/HelloTriangle.cpp', ],
},
{
'target_name': 'mip_map_2d',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'mip_map_2d/MipMap2D.cpp', ],
},
}],
],
'msvs_disabled_warnings': [ 4201 ],
'direct_dependent_settings':
{
'msvs_disabled_warnings': [ 4201 ],
'include_dirs':
[
'sample_util',
],
},
},
{
'target_name': 'hello_triangle',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'hello_triangle/HelloTriangle.cpp', ],
},
{
'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',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'multi_texture/MultiTexture.cpp', ],
'copies':
[
{
'target_name': 'multi_texture',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'multi_texture/MultiTexture.cpp', ],
'copies':
'destination': '<(PRODUCT_DIR)',
'files':
[
{
'destination': '<(PRODUCT_DIR)',
'files':
[
'multi_texture/basemap.tga',
'multi_texture/lightmap.tga',
],
},
]
'multi_texture/basemap.tga',
'multi_texture/lightmap.tga',
],
},
]
},
{
'target_name': 'multi_window',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'multi_window/MultiWindow.cpp', ],
},
{
'target_name': 'multi_window',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'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',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'multiple_draw_buffers/MultipleDrawBuffers.cpp', ],
'copies':
'destination': '<(PRODUCT_DIR)',
'files':
[
{
'destination': '<(PRODUCT_DIR)',
'files':
[
'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',
],
}
]
},
'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',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'particle_system/ParticleSystem.cpp', ],
'copies':
'destination': '<(PRODUCT_DIR)',
'files':
[
{
'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': 'simple_instancing',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'simple_instancing/SimpleInstancing.cpp', ],
},
'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': 'simple_texture_2d',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'simple_texture_2d/SimpleTexture2D.cpp', ],
},
{
'target_name': 'simple_instancing',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'simple_instancing/SimpleInstancing.cpp', ],
},
{
'target_name': 'simple_texture_cubemap',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'simple_texture_cubemap/SimpleTextureCubemap.cpp', ],
},
{
'target_name': 'simple_texture_2d',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'simple_texture_2d/SimpleTexture2D.cpp', ],
},
{
'target_name': 'simple_vertex_shader',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'simple_vertex_shader/SimpleVertexShader.cpp', ],
},
{
'target_name': 'simple_texture_cubemap',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'simple_texture_cubemap/SimpleTextureCubemap.cpp', ],
},
{
'target_name': 'stencil_operations',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'stencil_operations/StencilOperations.cpp', ],
},
{
'target_name': 'stencil_operations',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'stencil_operations/StencilOperations.cpp', ],
},
{
'target_name': 'tex_redef_microbench',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'tex_redef_microbench/TexRedefMicroBench.cpp', ],
},
{
'target_name': 'tex_redef_microbench',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'tex_redef_microbench/TexRedefMicroBench.cpp', ],
},
{
'target_name': 'texture_wrap',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'texture_wrap/TextureWrap.cpp', ],
},
{
'target_name': 'texture_wrap',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'texture_wrap/TextureWrap.cpp', ],
},
{
'target_name': 'tri_fan_microbench',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'tri_fan_microbench/TriFanMicroBench.cpp', ],
},
],
}
],
{
'target_name': 'tri_fan_microbench',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ 'tri_fan_microbench/TriFanMicroBench.cpp', ],
},
],
}
samples/simple_instancing/SimpleInstancing.cpp
......@@ -18,13 +18,14 @@
#include "shader_utils.h"
#include "texture_utils.h"
#include <cstring>
#include <iostream>
#include <vector>
class SimpleInstancingSample : public SampleApplication
{
public:
SimpleInstancingSample::SimpleInstancingSample()
SimpleInstancingSample()
: SampleApplication("SimpleInstancing", 1280, 720)
{
}
......
samples/simple_texture_2d/SimpleTexture2D.cpp
......@@ -20,7 +20,7 @@
class SimpleTexture2DSample : public SampleApplication
{
public:
SimpleTexture2DSample::SimpleTexture2DSample()
SimpleTexture2DSample()
: SampleApplication("SimpleTexture2D", 1280, 720)
{
}
......
samples/simple_texture_cubemap/SimpleTextureCubemap.cpp
......@@ -22,7 +22,7 @@
class SimpleTextureCubemapSample : public SampleApplication
{
public:
SimpleTextureCubemapSample::SimpleTextureCubemapSample()
SimpleTextureCubemapSample()
: SampleApplication("SimpleTextureCubemap", 1280, 720)
{
}
......
samples/simple_vertex_shader/SimpleVertexShader.cpp
......@@ -20,10 +20,12 @@
#include "Vector.h"
#include "Matrix.h"
#include <cmath>
class SimpleVertexShaderSample : public SampleApplication
{
public:
SimpleVertexShaderSample::SimpleVertexShaderSample()
SimpleVertexShaderSample()
: SampleApplication("SimpleVertexShader", 1280, 720)
{
}
......
samples/stencil_operations/StencilOperations.cpp
......@@ -19,7 +19,7 @@
class StencilOperationsSample : public SampleApplication
{
public:
StencilOperationsSample::StencilOperationsSample()
StencilOperationsSample()
: SampleApplication("StencilOperations", 1280, 720)
{
}
......
samples/tex_redef_microbench/TexRedefMicroBench.cpp
......@@ -13,12 +13,13 @@
// URLs: http://safari.informit.com/9780321563835
// http://www.opengles-book.com
#include <iostream>
#include "SampleApplication.h"
#include "shader_utils.h"
#include "texture_utils.h"
#include <cstring>
#include <iostream>
// This sample demonstrates the differences in rendering efficiency when
// drawing with already-created textures whose dimensions have been altered
// versus drawing with newly created textures.
......@@ -45,7 +46,7 @@
class TexRedefBenchSample : public SampleApplication
{
public:
TexRedefBenchSample::TexRedefBenchSample()
TexRedefBenchSample()
: SampleApplication("Microbench", 1280, 1280),
mFrameCount(0), mPixelsResize(NULL), mPixelsNewTex(NULL), mTimeFrame(false)
{
......
samples/texture_wrap/TextureWrap.cpp
......@@ -20,7 +20,7 @@
class TextureWrapSample : public SampleApplication
{
public:
TextureWrapSample::TextureWrapSample()
TextureWrapSample()
: SampleApplication("TextureWrap", 1280, 720)
{
}
......
samples/tri_fan_microbench/TriFanMicroBench.cpp
......@@ -13,11 +13,12 @@
// URLs: http://safari.informit.com/9780321563835
// http://www.opengles-book.com
#include <iostream>
#include "SampleApplication.h"
#include "shader_utils.h"
#include <cstring>
#include <iostream>
// This small sample compares the per-frame render time for a series of
// squares drawn with TRIANGLE_FANS versus squares drawn with TRIANGLES.
// To exacerbate differences between the two, we use a large collection
......@@ -26,7 +27,7 @@
class TriangleFanBenchSample : public SampleApplication
{
public:
TriangleFanBenchSample::TriangleFanBenchSample()
TriangleFanBenchSample()
: SampleApplication("Microbench", 1280, 1280),
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