diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 19:14:06 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 19:14:06 +0000 |
| commit | bc10076cb2c38dddee1f702c5cbaa724f122be2c (patch) | |
| tree | b0b1baa37fa6498bf970fc1f4c7f73345551de73 /gpu/gpu.gyp | |
| parent | 95ff077352e9cf1f78b79b2aa86e5675cbafae1d (diff) | |
| download | chromium_src-bc10076cb2c38dddee1f702c5cbaa724f122be2c.zip chromium_src-bc10076cb2c38dddee1f702c5cbaa724f122be2c.tar.gz chromium_src-bc10076cb2c38dddee1f702c5cbaa724f122be2c.tar.bz2 | |
Landing revision 47182 again: Added dependency on ANGLE for all platforms now that it compiles on mac and linx. Also added a GYP flag 'enable_shader_translation'. To enable shader translation define env variable: GYP_DEFINES="enable_shader_translation=1".
Review URL: http://codereview.chromium.org/2134002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 56 |
1 files changed, 17 insertions, 39 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index dc2c87b..b52d1fe 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -25,6 +25,9 @@ 'command_buffer/service/gl_utils.h', 'command_buffer/service/gpu_processor.h', 'command_buffer/service/gpu_processor.cc', + 'command_buffer/service/gpu_processor_linux.cc', + 'command_buffer/service/gpu_processor_mac.cc', + 'command_buffer/service/gpu_processor_win.cc', 'command_buffer/service/gpu_processor_mock.h', 'command_buffer/service/id_manager.h', 'command_buffer/service/id_manager.cc', @@ -37,29 +40,7 @@ 'command_buffer/service/texture_manager.h', 'command_buffer/service/texture_manager.cc', ], - 'conditions': [ - ['OS == "linux"', - { - 'gpu_service_source_files': [ - 'command_buffer/service/gpu_processor_linux.cc', - ], - }, - ], - ['OS == "win"', - { - 'gpu_service_source_files': [ - 'command_buffer/service/gpu_processor_win.cc', - ], - }, - ], - ['OS == "mac"', - { - 'gpu_service_source_files': [ - 'command_buffer/service/gpu_processor_mac.cc', - ], - }, - ], - ], + 'enable_shader_translation%': 0, }, 'targets': [ { @@ -284,22 +265,19 @@ '<@(gpu_service_source_files)', ], 'conditions': [ - ['OS == "linux"', - { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - ], - }, - ], - #TODO(alokp): Remove os-conditional when translator_glsl starts - #compiling on all platforms. - ['OS == "win"', - { - 'dependencies': [ - '../third_party/angle/src/build_angle.gyp:translator_glsl', - ], - }, - ], + ['OS == "linux"', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], + }], + ['enable_shader_translation==1', { + 'defines': [ + 'GLES2_GPU_SERVICE_TRANSLATE_SHADER', + ], + 'dependencies': [ + '../third_party/angle/src/build_angle.gyp:translator_glsl', + ], + }], ], }, { |