diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 22:34:22 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 22:34:22 +0000 |
| commit | 3f542024ab41547c02b079bb98101d8b3f1b8581 (patch) | |
| tree | 460183458ef3920d26703962e2264080ecc3f1b8 /gpu/gpu.gyp | |
| parent | 5d0798cd6107163118b604e632ac01e0e679dff5 (diff) | |
| download | chromium_src-3f542024ab41547c02b079bb98101d8b3f1b8581.zip chromium_src-3f542024ab41547c02b079bb98101d8b3f1b8581.tar.gz chromium_src-3f542024ab41547c02b079bb98101d8b3f1b8581.tar.bz2 | |
Update the GLSL translator code to use the correct constants
and save the error log so it can be passed back through GL
calls.
This also links with the GLSL translator always
TEST=conformance tests
BUG=none
Review URL: http://codereview.chromium.org/2096008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47578 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', ], |