summaryrefslogtreecommitdiffstats
path: root/gpu/gpu.gyp
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 20:58:33 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 20:58:33 +0000
commit251f39e2e355634857ff4e67d8a7b4b85124de73 (patch)
tree25b5ce068b6349bdee282d17be5dcd3408d704ce /gpu/gpu.gyp
parent7fbb264f4a87ba3c93a74c4412a599c3bbb3a4f6 (diff)
downloadchromium_src-251f39e2e355634857ff4e67d8a7b4b85124de73.zip
chromium_src-251f39e2e355634857ff4e67d8a7b4b85124de73.tar.gz
chromium_src-251f39e2e355634857ff4e67d8a7b4b85124de73.tar.bz2
Moved GLContext class to gfx/gl.
Now it can be used by code outside of the gpu project, for example AcceleratedSurface. TEST=trybots BUG=none Review URL: http://codereview.chromium.org/1694003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
-rw-r--r--gpu/gpu.gyp22
1 files changed, 1 insertions, 21 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index ff3391e..a8b841e 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -22,8 +22,6 @@
'command_buffer/service/gles2_cmd_validation.cc',
'command_buffer/service/gles2_cmd_validation_autogen.h',
'command_buffer/service/gles2_cmd_validation_implementation_autogen.h',
- 'command_buffer/service/gl_context.cc',
- 'command_buffer/service/gl_context.h',
'command_buffer/service/gl_utils.h',
'command_buffer/service/gpu_processor.h',
'command_buffer/service/gpu_processor.cc',
@@ -278,11 +276,10 @@
'dependencies': [
'command_buffer_service_impl',
'gl_libs',
+ '../gfx/gfx.gyp:gfx_gl',
],
'sources': [
'<@(gpu_service_source_files)',
- 'command_buffer/service/gl_context_osmesa.cc',
- 'command_buffer/service/gl_context_osmesa.h',
],
'conditions': [
['OS == "linux"',
@@ -290,23 +287,6 @@
'dependencies': [
'../build/linux/system.gyp:gtk',
],
- 'sources': [
- 'command_buffer/service/gl_context_linux.cc',
- ],
- },
- ],
- ['OS == "win"',
- {
- 'sources': [
- 'command_buffer/service/gl_context_win.cc',
- ],
- },
- ],
- ['OS == "mac"',
- {
- 'sources': [
- 'command_buffer/service/gl_context_mac.cc',
- ],
},
],
],