diff options
author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 23:12:20 +0000 |
---|---|---|
committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 23:12:20 +0000 |
commit | a53e7d097761aa379ffdcb573bd51159b9833d4a (patch) | |
tree | 8204b3e55cd89aefab59ead9a9d62daaa86e8337 /gpu/gpu.gyp | |
parent | 24dd80bde5e446e248007e4d1127594c48f1ecf3 (diff) | |
download | chromium_src-a53e7d097761aa379ffdcb573bd51159b9833d4a.zip chromium_src-a53e7d097761aa379ffdcb573bd51159b9833d4a.tar.gz chromium_src-a53e7d097761aa379ffdcb573bd51159b9833d4a.tar.bz2 |
Resubmit with fix that trybot didn't catch.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
-rw-r--r-- | gpu/gpu.gyp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index b52d1fe..ef39e53 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -40,7 +40,6 @@ 'command_buffer/service/texture_manager.h', 'command_buffer/service/texture_manager.cc', ], - 'enable_shader_translation%': 0, }, 'targets': [ { @@ -270,7 +269,9 @@ '../build/linux/system.gyp:gtk', ], }], - ['enable_shader_translation==1', { + # 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', { 'defines': [ 'GLES2_GPU_SERVICE_TRANSLATE_SHADER', ], |