diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-13 20:30:51 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-13 20:30:51 +0000 |
| commit | 2cb1fa9f537b92908693eddc4489c38ab3318225 (patch) | |
| tree | a013d5d4c7b79ededaf0589a73f503f96092bcba /gpu/gpu.gyp | |
| parent | f1917ed6945d79a12fe45957c46584dfe8771dbb (diff) | |
| download | chromium_src-2cb1fa9f537b92908693eddc4489c38ab3318225.zip chromium_src-2cb1fa9f537b92908693eddc4489c38ab3318225.tar.gz chromium_src-2cb1fa9f537b92908693eddc4489c38ab3318225.tar.bz2 | |
Revert 47182 - 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: enable_shader_translation=1.
Review URL: http://codereview.chromium.org/1988011
TBR=alokp@chromium.org
Review URL: http://codereview.chromium.org/2082004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 52 |
1 files changed, 39 insertions, 13 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 683146e..dc2c87b 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -25,9 +25,6 @@ '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', @@ -40,7 +37,29 @@ 'command_buffer/service/texture_manager.h', 'command_buffer/service/texture_manager.cc', ], - 'enable_shader_translation%': 0, + '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', + ], + }, + ], + ], }, 'targets': [ { @@ -260,20 +279,27 @@ 'command_buffer_service_impl', 'gl_libs', '../app/app.gyp:app_base', - '../third_party/angle/src/build_angle.gyp:translator_glsl', ], 'sources': [ '<@(gpu_service_source_files)', ], 'conditions': [ - ['OS == "linux"', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - ], - }], - ['enable_shader_translation==1', { - 'defines': ['GLES2_GPU_SERVICE_TRANSLATE_SHADER'], - }], + ['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', + ], + }, + ], ], }, { |