diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 21:31:53 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 21:31:53 +0000 |
| commit | 96f8063420f0170207f8b8fad211c70d3ad66db6 (patch) | |
| tree | ecd625784f6ccf6a699f51a888e7e70056ab4bc0 /gpu/gpu.gyp | |
| parent | d3d0ef9739170a270dcb2f070f2364aa003aea9c (diff) | |
| download | chromium_src-96f8063420f0170207f8b8fad211c70d3ad66db6.zip chromium_src-96f8063420f0170207f8b8fad211c70d3ad66db6.tar.gz chromium_src-96f8063420f0170207f8b8fad211c70d3ad66db6.tar.bz2 | |
Revert 45240 - 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
TBR=jamesr@chromium.org
Review URL: http://codereview.chromium.org/1747007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index a8b841e..ff3391e 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -22,6 +22,8 @@ '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', @@ -276,10 +278,11 @@ '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"', @@ -287,6 +290,23 @@ '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', + ], }, ], ], |