diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 19:30:36 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 19:30:36 +0000 |
| commit | 4ee0c305219d65cb8602666b580337fd63eb7aa8 (patch) | |
| tree | a5433aeab82dd4a032b0670362b52c4b4beb29f3 /gpu/gpu.gyp | |
| parent | 333ec8d0c72faffd714d724d3d583e65d4c46812 (diff) | |
| download | chromium_src-4ee0c305219d65cb8602666b580337fd63eb7aa8.zip chromium_src-4ee0c305219d65cb8602666b580337fd63eb7aa8.tar.gz chromium_src-4ee0c305219d65cb8602666b580337fd63eb7aa8.tar.bz2 | |
Revert 101545 - Moved code not relating to GPU scheduling out of GpuScheduler and into GpuCommandBufferStub.
Reason for revert: Compile failure on Arm.
This was mostly a refactor because the code was awkward.
I also deleted the original gles2_demo since we have the gles2 book demos now.
THings still to do are a common way of setting up the few objects involved in initializing a command buffer that is now more-or-less duplicated in the gles2 conformance tests, the gles2 demos, the command buffer stub and the in-process webgl context. I also want to completely remove the reference to the decoder from the scheduler.
I tested WebGL on both windows and mac and saw no regressions. I checked the conformance tests, the gpu tests and am running by the try bots now. The gles2 demos still work.
Review URL: http://codereview.chromium.org/7782041
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/7920015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index dbb7cee..b571fe1 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -217,7 +217,10 @@ 'command_buffer/service/gl_utils.h', 'command_buffer/service/gpu_scheduler.h', 'command_buffer/service/gpu_scheduler.cc', + 'command_buffer/service/gpu_scheduler_linux.cc', + 'command_buffer/service/gpu_scheduler_mac.cc', 'command_buffer/service/gpu_scheduler_mock.h', + 'command_buffer/service/gpu_scheduler_win.cc', 'command_buffer/service/id_manager.h', 'command_buffer/service/id_manager.cc', 'command_buffer/service/mocks.h', @@ -330,6 +333,20 @@ ], }, { + 'target_name': 'gles2_demo_lib', + 'type': 'static_library', + 'dependencies': [ + 'command_buffer_client', + 'gles2_c_lib', + ], + 'sources': [ + 'command_buffer/client/gles2_demo_c.h', + 'command_buffer/client/gles2_demo_c.c', + 'command_buffer/client/gles2_demo_cc.h', + 'command_buffer/client/gles2_demo_cc.cc', + ], + }, + { 'target_name': 'gpu_ipc', 'type': 'static_library', 'dependencies': [ @@ -346,4 +363,32 @@ ], }, ], + 'conditions': [ + ['OS == "win"', + { + 'targets': [ + { + 'target_name': 'gles2_demo', + 'type': 'executable', + 'dependencies': [ + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + 'command_buffer_service', + 'gles2_demo_lib', + ], + 'sources': [ + 'command_buffer/client/gles2_demo.cc', + ], + 'msvs_settings': { + 'VCLinkerTool': { + # 0 == not set + # 1 == /SUBSYSTEM:CONSOLE + # 2 == /SUBSYSTEM:WINDOWS + 'SubSystem': '2', + }, + }, + }, + ], + }, + ], + ], } |