diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 18:32:06 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 18:32:06 +0000 |
| commit | 5a6db6cd70a969bc78d931ba352d222db0682ece (patch) | |
| tree | a97c62adccbda5956cf9f3511da5d1328c847cd6 /gpu/gpu.gyp | |
| parent | 2f28c5684b55211bd4ea28b4407128e0ae86ddee (diff) | |
| download | chromium_src-5a6db6cd70a969bc78d931ba352d222db0682ece.zip chromium_src-5a6db6cd70a969bc78d931ba352d222db0682ece.tar.gz chromium_src-5a6db6cd70a969bc78d931ba352d222db0682ece.tar.bz2 | |
Landing 45240 again.
GLContext implementations were dependent on some stuff in app/.
Moved GLContext class to app/gfx/gl. Now it can be used by code outside of the gpu project, for example AcceleratedSurface.
TEST=trybots, checkdeps
BUG=none
Review URL: http://codereview.chromium.org/1689006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index ff3391e..d270126 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', + '../app/app.gyp:app_base', ], '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', - ], }, ], ], |