diff options
| author | primiano@chromium.org <primiano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 11:56:58 +0000 |
|---|---|---|
| committer | primiano@chromium.org <primiano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 11:56:58 +0000 |
| commit | cace58c813c04d958550ba2bc0a74ae5f3411f3a (patch) | |
| tree | b5dbca65a4423e31d6134f7b80cdf271d018eb0e /gpu/gpu.gyp | |
| parent | e7c711963de546a302793f619235723f8230bb8c (diff) | |
| download | chromium_src-cace58c813c04d958550ba2bc0a74ae5f3411f3a.zip chromium_src-cace58c813c04d958550ba2bc0a74ae5f3411f3a.tar.gz chromium_src-cace58c813c04d958550ba2bc0a74ae5f3411f3a.tar.bz2 | |
Cleanup GPU dependencies for gl_in_process_context
This CL decouples the gl_in_process_context from gles2_implementation,
introducing a dedicated target (gl_in_process_context) and fixing the
corresponding dependencies.
This is a pre-requisite for crrev.com/228003006 and crbug.com/159847
BUG=159847
Review URL: https://codereview.chromium.org/247073005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 34f849d..8022d48 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -16,27 +16,42 @@ 'type': '<(component)', 'dependencies': [ '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../third_party/khronos/khronos.gyp:khronos_headers', - '../ui/gl/gl.gyp:gl', - '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', + '../ui/gl/gl.gyp:gl', 'command_buffer/command_buffer.gyp:gles2_utils', 'gles2_cmd_helper', - 'gpu', ], 'defines': [ 'GLES2_IMPL_IMPLEMENTATION', ], 'sources': [ '<@(gles2_implementation_source_files)', - 'command_buffer/client/gl_in_process_context.h', - 'command_buffer/client/gl_in_process_context.cc', ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, { + 'target_name': 'gl_in_process_context', + 'type': '<(component)', + 'dependencies': [ + 'gles2_implementation', + 'gpu', + '../base/base.gyp:base', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../ui/gfx/gfx.gyp:gfx_geometry', + '../ui/gl/gl.gyp:gl', + ], + 'defines': [ + 'GL_IN_PROCESS_CONTEXT_IMPLEMENTATION', + ], + 'sources': [ + 'command_buffer/client/gl_in_process_context.h', + 'command_buffer/client/gl_in_process_context.cc', + 'command_buffer/client/gl_in_process_context_export.h', + ], + }, + { # Library emulates GLES2 using command_buffers. 'target_name': 'gles2_implementation_client_side_arrays', 'type': '<(component)', |