summaryrefslogtreecommitdiffstats
path: root/gpu/gpu.gyp
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-16 18:58:54 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-16 18:58:54 +0000
commit4bbe6d0c3ceb04efe623184d299867d1f5a320f2 (patch)
treee3705f4cc2ebbf5c6de112ba92ce2a8cc434c2da /gpu/gpu.gyp
parent4d1ffe7bb8cf7d97dc66e4a72af992177b293052 (diff)
downloadchromium_src-4bbe6d0c3ceb04efe623184d299867d1f5a320f2.zip
chromium_src-4bbe6d0c3ceb04efe623184d299867d1f5a320f2.tar.gz
chromium_src-4bbe6d0c3ceb04efe623184d299867d1f5a320f2.tar.bz2
Moved code not relating to GPU scheduling out of GpuScheduler and into GpuCommandBufferStub.
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
-rw-r--r--gpu/gpu.gyp45
1 files changed, 0 insertions, 45 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index b571fe1..dbb7cee 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -217,10 +217,7 @@
'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',
@@ -333,20 +330,6 @@
],
},
{
- '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': [
@@ -363,32 +346,4 @@
],
},
],
- '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',
- },
- },
- },
- ],
- },
- ],
- ],
}