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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/demos/demos.gyp

Issue 3132017: GLES demos on PPAPI. (Closed)
Patch Set: Removed DEPS, they are already up to date. Created 10 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 | « no previous file | gpu/demos/framework/DEPS » ('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 e7fc57eaf6ae142696665b43c639a75c534c1f1d..9acad0958d8a7e59fc3e4da6f2dd618a7e842c39 100644
--- a/gpu/demos/demos.gyp
+++ b/gpu/demos/demos.gyp
@@ -60,6 +60,7 @@
# If the dependent is a none-type target (like all.gyp), gyp will
# generate error due to these injected source files. Workaround this
# problem by preventing it from being selected by demos.gyp:*.
+ # TODO(neb): remove source injection and this flag.
'suppress_wildcard': 1,
'dependencies': [
'gpu_demo_framework',
@@ -117,6 +118,69 @@
},
},
{
+ 'target_name': 'gpu_demo_framework_ppapi',
+ 'type': 'static_library',
+ 'dependencies': [
+ 'gpu_demo_framework',
+ '../../third_party/ppapi/ppapi.gyp:ppapi_cpp',
+ '../../third_party/ppapi/ppapi.gyp:ppapi_cpp_objects'
+ ],
+ 'include_dirs': [
+ '../..',
+ '../../third_party/ppapi',
+ '../../third_party/gles2_book/Common/Include',
+ ],
+ 'sources': [
+ 'framework/pepper.cc',
+ '../../third_party/gles2_book/Common/Include/esUtil.h',
+ '../../third_party/gles2_book/Common/Include/esUtil_win.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': [
+ '../../third_party',
+ '../../third_party/gles2_book/Common/Include',
+ '../../third_party/ppapi',
+ '../..'
+ ],
+ 'run_as': {
+ 'conditions': [
+ ['OS=="mac"', {
+ 'action': [
+ '<(PRODUCT_DIR)/Chromium.app/Contents/MacOS/Chromium',
+ '--enable-gpu-plugin',
+ '--register-pepper-plugins='
+ '<(PRODUCT_DIR)/$(PRODUCT_NAME).plugin;'
+ 'pepper-application/x-gpu-demo',
+ 'file://$(SOURCE_ROOT)/pepper_gpu_demo.html',
+ ],
+ }, { # OS != "mac"
+ 'action': [
+ '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)',
+ '--enable-gpu-plugin',
+ '--register-pepper-plugins=$(TargetPath);'
+ 'pepper-application/x-gpu-demo',
+ 'file://$(ProjectDir)pepper_gpu_demo.html',
+ ],
+ }],
+ ],
+ },
+ 'conditions': [
+ ['OS=="linux"', {
+ # -gstabs, used in the official builds, causes an ICE. Remove it.
+ 'cflags!': ['-gstabs'],
+ }],
+ ['OS=="mac"', {
+ 'mac_bundle': 1,
+ 'product_extension': 'plugin',
+ }],
+ ],
+ },
+ },
+ {
'target_name': 'hello_triangle_exe',
'type': 'executable',
'dependencies': [
@@ -125,7 +189,7 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/hello_triangle.cc',
+ 'gles2_book/demo_hello_triangle.cc',
],
},
{
@@ -137,7 +201,7 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/mip_map_2d.cc',
+ 'gles2_book/demo_mip_map_2d.cc',
],
},
{
@@ -149,7 +213,7 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/simple_texture_2d.cc',
+ 'gles2_book/demo_simple_texture_2d.cc',
],
},
{
@@ -161,7 +225,7 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/simple_texture_cubemap.cc',
+ 'gles2_book/demo_simple_texture_cubemap.cc',
],
},
{
@@ -173,7 +237,7 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/simple_vertex_shader.cc',
+ 'gles2_book/demo_simple_vertex_shader.cc',
],
},
{
@@ -185,7 +249,7 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/stencil_test.cc',
+ 'gles2_book/demo_stencil_test.cc',
],
},
{
@@ -197,7 +261,7 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/texture_wrap.cc',
+ 'gles2_book/demo_texture_wrap.cc',
],
},
],
@@ -213,7 +277,7 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/hello_triangle.cc',
+ 'gles2_book/demo_hello_triangle.cc',
],
},
{
@@ -225,7 +289,7 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/mip_map_2d.cc',
+ 'gles2_book/demo_mip_map_2d.cc',
],
},
{
@@ -237,7 +301,7 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/simple_texture_2d.cc',
+ 'gles2_book/demo_simple_texture_2d.cc',
],
},
{
@@ -249,7 +313,7 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/simple_texture_cubemap.cc',
+ 'gles2_book/demo_simple_texture_cubemap.cc',
],
},
{
@@ -261,7 +325,7 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/simple_vertex_shader.cc',
+ 'gles2_book/demo_simple_vertex_shader.cc',
],
},
{
@@ -273,7 +337,7 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/stencil_test.cc',
+ 'gles2_book/demo_stencil_test.cc',
],
},
{
@@ -285,7 +349,91 @@
],
'sources': [
'gles2_book/example.h',
- 'gles2_book/texture_wrap.cc',
+ 'gles2_book/demo_texture_wrap.cc',
+ ],
+ },
+ {
+ 'target_name': 'hello_triangle_ppapi',
+ 'type': 'loadable_module',
+ 'variables': { 'chromium_code': 0, },
+ 'dependencies': [ 'gpu_demo_framework_ppapi', ],
+ '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': [
+ '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': [
+ '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': [
+ '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': [
+ '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': [
+ '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': [
+ '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 | « no previous file | gpu/demos/framework/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698