diff options
author | courage@chromium.org <courage@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 21:10:57 +0000 |
---|---|---|
committer | courage@chromium.org <courage@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 21:10:57 +0000 |
commit | 6e7186eaef0075c6e3e68afba68e0f6edcec00bb (patch) | |
tree | 005907ff00ff7c96eb3ac428c63d6a0438ea7b7d /gpu/demos/demos.gyp | |
parent | 17b713f8f5a697e4baa2f7d080c04dac90074545 (diff) | |
download | chromium_src-6e7186eaef0075c6e3e68afba68e0f6edcec00bb.zip chromium_src-6e7186eaef0075c6e3e68afba68e0f6edcec00bb.tar.gz chromium_src-6e7186eaef0075c6e3e68afba68e0f6edcec00bb.tar.bz2 |
Revert 215672 "Deleted third_party/gles2_book based demos." (build fix)
> Deleted third_party/gles2_book based demos.
>
> They get broken all the time because nobody builds them. These demos were originally added to manually exercise command-buffer. Most of these have already been replaced by gl_tests and gles2 conformance tests.
>
> Note that I am only deleting the gles2_book demos in this patch. I intend to delete the demo framework as well. But I will do it in a subsequent patch so that it is easier to resurrect the framework if needed.
>
> BUG=98130
> TBR=apatrick@chromium.org, phajdan.jr@chromium.org
>
> Review URL: https://codereview.chromium.org/21998003
TBR=alokp@chromium.org
Review URL: https://codereview.chromium.org/22282002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos/demos.gyp')
-rw-r--r-- | gpu/demos/demos.gyp | 213 |
1 files changed, 213 insertions, 0 deletions
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp index 5b89759..e716bf7 100644 --- a/gpu/demos/demos.gyp +++ b/gpu/demos/demos.gyp @@ -73,14 +73,21 @@ 'include_dirs': [ '../..', '../../ppapi/lib/gl/include', + '../../third_party/gles2_book/Common/Include', ], 'sources': [ 'framework/pepper.cc', + '../../third_party/gles2_book/Common/Include/esUtil.h', + '../../third_party/gles2_book/Common/Source/esShader.c', + '../../third_party/gles2_book/Common/Source/esShapes.c', + '../../third_party/gles2_book/Common/Source/esTransform.c', + '../../third_party/gles2_book/Common/Source/esUtil.c', ], 'direct_dependent_settings': { 'include_dirs': [ '../..', '../../ppapi/lib/gl/include', + '../../third_party/gles2_book/Common/Include', ], 'run_as': { 'conditions': [ @@ -114,5 +121,211 @@ ], }, }, + { + 'target_name': 'hello_triangle_exe', + 'type': 'executable', + 'dependencies': [ + 'gpu_demo_framework_exe', + '../../third_party/gles2_book/gles2_book.gyp:hello_triangle', + ], + 'sources': [ + 'gles2_book/example.h', + 'gles2_book/demo_hello_triangle.cc', + ], + }, + { + 'target_name': 'mip_map_2d_exe', + 'type': 'executable', + 'dependencies': [ + 'gpu_demo_framework_exe', + '../../third_party/gles2_book/gles2_book.gyp:mip_map_2d', + ], + 'sources': [ + 'gles2_book/example.h', + 'gles2_book/demo_mip_map_2d.cc', + ], + }, + { + 'target_name': 'simple_texture_2d_exe', + 'type': 'executable', + 'dependencies': [ + 'gpu_demo_framework_exe', + '../../third_party/gles2_book/gles2_book.gyp:simple_texture_2d', + ], + 'sources': [ + 'gles2_book/example.h', + 'gles2_book/demo_simple_texture_2d.cc', + ], + }, + { + 'target_name': 'simple_texture_cubemap_exe', + 'type': 'executable', + 'dependencies': [ + 'gpu_demo_framework_exe', + '../../third_party/gles2_book/gles2_book.gyp:simple_texture_cubemap', + ], + 'sources': [ + 'gles2_book/example.h', + 'gles2_book/demo_simple_texture_cubemap.cc', + ], + }, + { + 'target_name': 'simple_vertex_shader_exe', + 'type': 'executable', + 'dependencies': [ + 'gpu_demo_framework_exe', + '../../third_party/gles2_book/gles2_book.gyp:simple_vertex_shader', + ], + 'sources': [ + 'gles2_book/example.h', + 'gles2_book/demo_simple_vertex_shader.cc', + ], + }, + { + 'target_name': 'stencil_test_exe', + 'type': 'executable', + 'dependencies': [ + 'gpu_demo_framework_exe', + '../../third_party/gles2_book/gles2_book.gyp:stencil_test', + ], + 'sources': [ + 'gles2_book/example.h', + 'gles2_book/demo_stencil_test.cc', + ], + }, + { + 'target_name': 'texture_wrap_exe', + 'type': 'executable', + 'dependencies': [ + 'gpu_demo_framework_exe', + '../../third_party/gles2_book/gles2_book.gyp:texture_wrap', + ], + 'sources': [ + 'gles2_book/example.h', + 'gles2_book/demo_texture_wrap.cc', + ], + }, + { + 'target_name': 'compressed_textures_exe', + 'type': 'executable', + 'dependencies': [ + 'gpu_demo_framework_exe', + '../../third_party/gles2_book/gles2_book.gyp:es_util', + ], + 'sources': [ + 'compressed_textures/compressed_textures.cc', + ], + }, + { + 'target_name': 'occlusion_query_exe', + 'type': 'executable', + 'dependencies': [ + 'gpu_demo_framework_exe', + '../../third_party/gles2_book/gles2_book.gyp:es_util', + ], + 'defines': [ + 'GL_GLEXT_PROTOTYPES', + ], + 'sources': [ + 'occlusion_query/occlusion_query.cc', + ], + }, + ], + 'conditions': [ + ['enable_pepper_demos==1', { + 'targets': [ + { + 'target_name': 'hello_triangle_ppapi', + 'type': 'loadable_module', + 'variables': { 'chromium_code': 0, }, + 'dependencies': [ 'gpu_demo_framework_ppapi', ], + 'sources': [ + '<@(ppp_entrypoints_sources)', + 'gles2_book/example.h', + 'gles2_book/demo_hello_triangle.cc', + '../../third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.c', + '../../third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.h', + ], + }, + { + 'target_name': 'mip_map_2d_ppapi', + 'type': 'loadable_module', + 'variables': { 'chromium_code': 0, }, + 'dependencies': [ 'gpu_demo_framework_ppapi', ], + 'sources': [ + '<@(ppp_entrypoints_sources)', + 'gles2_book/example.h', + 'gles2_book/demo_mip_map_2d.cc', + '../../third_party/gles2_book/Chapter_9/MipMap2D/MipMap2D.c', + '../../third_party/gles2_book/Chapter_9/MipMap2D/MipMap2D.h', + ], + }, + { + 'target_name': 'simple_texture_2d_ppapi', + 'type': 'loadable_module', + 'variables': { 'chromium_code': 0, }, + 'dependencies': [ 'gpu_demo_framework_ppapi', ], + 'sources': [ + '<@(ppp_entrypoints_sources)', + 'gles2_book/example.h', + 'gles2_book/demo_simple_texture_2d.cc', + '../../third_party/gles2_book/Chapter_9/Simple_Texture2D/Simple_Texture2D.c', + '../../third_party/gles2_book/Chapter_9/Simple_Texture2D/Simple_Texture2D.h', + ], + }, + { + 'target_name': 'simple_texture_cubemap_ppapi', + 'type': 'loadable_module', + 'variables': { 'chromium_code': 0, }, + 'dependencies': [ 'gpu_demo_framework_ppapi', ], + 'sources': [ + '<@(ppp_entrypoints_sources)', + 'gles2_book/example.h', + 'gles2_book/demo_simple_texture_cubemap.cc', + '../../third_party/gles2_book/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.c', + '../../third_party/gles2_book/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.h', + ], + }, + { + 'target_name': 'simple_vertex_shader_ppapi', + 'type': 'loadable_module', + 'variables': { 'chromium_code': 0, }, + 'dependencies': [ 'gpu_demo_framework_ppapi', ], + 'sources': [ + '<@(ppp_entrypoints_sources)', + 'gles2_book/example.h', + 'gles2_book/demo_simple_vertex_shader.cc', + '../../third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.c', + '../../third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.h', + ], + }, + { + 'target_name': 'stencil_test_ppapi', + 'type': 'loadable_module', + 'variables': { 'chromium_code': 0, }, + 'dependencies': [ 'gpu_demo_framework_ppapi', ], + 'sources': [ + '<@(ppp_entrypoints_sources)', + 'gles2_book/example.h', + 'gles2_book/demo_stencil_test.cc', + '../../third_party/gles2_book/Chapter_11/Stencil_Test/Stencil_Test.c', + '../../third_party/gles2_book/Chapter_11/Stencil_Test/Stencil_Test.h', + ], + }, + { + 'target_name': 'texture_wrap_ppapi', + 'type': 'loadable_module', + 'variables': { 'chromium_code': 0, }, + 'dependencies': [ 'gpu_demo_framework_ppapi', ], + 'sources': [ + '<@(ppp_entrypoints_sources)', + 'gles2_book/example.h', + 'gles2_book/demo_texture_wrap.cc', + '../../third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c', + '../../third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.h', + ], + }, + ], + }], ], } |