diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-13 20:18:46 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-13 20:18:46 +0000 |
| commit | 9058cb1af2c337afdb65640956662d51336c4f98 (patch) | |
| tree | ba41ce83522de9dd9a48ff8cfac77e74dfd4a6cc /gpu/gpu.gyp | |
| parent | 3908c02172554f742c2f70c12e75915e4fb23e3d (diff) | |
| download | chromium_src-9058cb1af2c337afdb65640956662d51336c4f98.zip chromium_src-9058cb1af2c337afdb65640956662d51336c4f98.tar.gz chromium_src-9058cb1af2c337afdb65640956662d51336c4f98.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 52 |
1 files changed, 13 insertions, 39 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index dc2c87b..683146e 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': [ { @@ -279,27 +260,20 @@ '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', - ], - }, - ], - #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'], + }], ], }, { |