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

Unified Diff: gpu/demos/demos.gyp

Issue 554053: Added infrastructure to run gpu demos under Pepper3D. Created a Demo class th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 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/app_framework/platform.h ('k') | gpu/demos/framework/demo.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/demos/demos.gyp
===================================================================
--- gpu/demos/demos.gyp (revision 36982)
+++ gpu/demos/demos.gyp (working copy)
@@ -11,95 +11,89 @@
],
'targets': [
{
- 'target_name': 'app_framework',
+ 'target_name': 'gpu_demo_framework',
'type': 'static_library',
'dependencies': [
- '../gpu.gyp:command_buffer_client',
- '../gpu.gyp:command_buffer_service',
+ '../../base/base.gyp:base',
],
'sources': [
- 'app_framework/application.cc',
- 'app_framework/application.h',
- 'app_framework/platform.h',
+ 'framework/demo.cc',
+ 'framework/demo.h',
+ 'framework/demo_factory.h',
],
},
{
- 'target_name': 'hello_triangle',
- 'type': 'executable',
+ 'target_name': 'gpu_demo_framework_exe',
+ 'type': 'static_library',
'dependencies': [
- 'app_framework',
- '../../third_party/gles2_book/gles2_book.gyp:hello_triangle',
+ 'gpu_demo_framework',
+ '../gpu.gyp:command_buffer_client',
+ '../gpu.gyp:command_buffer_service',
],
+ 'all_dependent_settings': {
+ 'sources': [
+ 'framework/main_exe.cc',
+ ],
+ },
'sources': [
- 'hello_triangle/main.cc',
+ 'framework/platform.h',
+ 'framework/window.cc',
+ 'framework/window.h',
],
},
{
- 'target_name': 'mip_map_2d',
- 'type': 'executable',
+ 'target_name': 'gpu_demo_framework_pepper',
+ 'type': 'static_library',
'dependencies': [
- 'app_framework',
- '../../third_party/gles2_book/gles2_book.gyp:mip_map_2d',
+ 'gpu_demo_framework',
+ '../gpu.gyp:pgl',
],
+ 'all_dependent_settings': {
+ 'sources': [
+ 'framework/main_pepper.cc',
+ 'framework/plugin.def',
+ 'framework/plugin.rc',
+ ],
+ 'run_as': {
+ 'action': [
+ '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)',
+ '--no-sandbox',
+ '--internal-pepper',
+ '--enable-gpu-plugin',
+ '--load-plugin=$(TargetPath)',
+ 'file://$(ProjectDir)pepper_gpu_demo.html',
+ ],
+ },
+ },
'sources': [
- 'mip_map_2d/main.cc',
+ 'framework/plugin.cc',
+ 'framework/plugin.h',
],
},
{
- 'target_name': 'simple_texture_2d',
+ 'target_name': 'hello_triangle_exe',
'type': 'executable',
'dependencies': [
- 'app_framework',
- '../../third_party/gles2_book/gles2_book.gyp:simple_texture_2d',
+ 'gpu_demo_framework_exe',
+ '../../third_party/gles2_book/gles2_book.gyp:hello_triangle',
],
'sources': [
- 'simple_texture_2d/main.cc',
+ 'gles2_book/example.h',
+ 'gles2_book/hello_triangle.cc',
],
},
{
- 'target_name': 'simple_texture_cubemap',
- 'type': 'executable',
+ 'target_name': 'hello_triangle_pepper',
+ 'type': 'shared_library',
'dependencies': [
- 'app_framework',
- '../../third_party/gles2_book/gles2_book.gyp:simple_texture_cubemap',
+ 'gpu_demo_framework_pepper',
+ '../../third_party/gles2_book/gles2_book.gyp:hello_triangle',
],
'sources': [
- 'simple_texture_cubemap/main.cc',
+ 'gles2_book/example.h',
+ 'gles2_book/hello_triangle.cc',
],
},
- {
- 'target_name': 'simple_vertex_shader',
- 'type': 'executable',
- 'dependencies': [
- 'app_framework',
- '../../third_party/gles2_book/gles2_book.gyp:simple_vertex_shader',
- ],
- 'sources': [
- 'simple_vertex_shader/main.cc',
- ],
- },
- {
- 'target_name': 'stencil_test',
- 'type': 'executable',
- 'dependencies': [
- 'app_framework',
- '../../third_party/gles2_book/gles2_book.gyp:stencil_test',
- ],
- 'sources': [
- 'stencil_test/main.cc',
- ],
- },
- {
- 'target_name': 'texture_wrap',
- 'type': 'executable',
- 'dependencies': [
- 'app_framework',
- '../../third_party/gles2_book/gles2_book.gyp:texture_wrap',
- ],
- 'sources': [
- 'texture_wrap/main.cc',
- ],
- },
]
}
« no previous file with comments | « gpu/demos/app_framework/platform.h ('k') | gpu/demos/framework/demo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698