Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1177)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/demos/demos.gyp

Issue 22299002: Reland a portion of r215672. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/demos/compressed_textures/compressed_textures.cc ('k') | gpu/demos/gles2_book/demo_hello_triangle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/demos/demos.gyp
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp
index e716bf7e7cf89a5878eb4934a53bcdfb62e09991..5b89759e1edf04461724ab5112076da439781f3e 100644
--- a/gpu/demos/demos.gyp
+++ b/gpu/demos/demos.gyp
@@ -73,21 +73,14 @@
'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': [
@@ -121,211 +114,5 @@
],
},
},
- {
- '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',
- ],
- },
- ],
- }],
],
}
« no previous file with comments | « gpu/demos/compressed_textures/compressed_textures.cc ('k') | gpu/demos/gles2_book/demo_hello_triangle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698