diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 23:25:17 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 23:25:17 +0000 |
| commit | 057caaf1e0f45d297032935de0b6f70a038f50d8 (patch) | |
| tree | 1da2f84151a96f514fda552228356598699c5af3 /gpu/gpu.gyp | |
| parent | a53e7d097761aa379ffdcb573bd51159b9833d4a (diff) | |
| download | chromium_src-057caaf1e0f45d297032935de0b6f70a038f50d8.zip chromium_src-057caaf1e0f45d297032935de0b6f70a038f50d8.tar.gz chromium_src-057caaf1e0f45d297032935de0b6f70a038f50d8.tar.bz2 | |
Reverting again, will manually build on linux since trybots are apparently not up to the task >:-(
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index ef39e53..b52d1fe 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -40,6 +40,7 @@ 'command_buffer/service/texture_manager.h', 'command_buffer/service/texture_manager.cc', ], + 'enable_shader_translation%': 0, }, 'targets': [ { @@ -269,9 +270,7 @@ '../build/linux/system.gyp:gtk', ], }], - # TODO(gman): Change this condition to be false if the backend is - # native OpenGL ES 2.0 and false if the backend is OpenGL. - ['1==1', { + ['enable_shader_translation==1', { 'defines': [ 'GLES2_GPU_SERVICE_TRANSLATE_SHADER', ], |