diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-19 21:01:48 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-19 21:01:48 +0000 |
| commit | 8f1ccdacbcfb47fa2eeb6c7e748f55c7ae4bafec (patch) | |
| tree | 7d14db579aba792e6f3f146237ce55bc82786147 /gpu/gpu.gyp | |
| parent | ebd1048ab80dbf90baa05beffe4319cd53920091 (diff) | |
| download | chromium_src-8f1ccdacbcfb47fa2eeb6c7e748f55c7ae4bafec.zip chromium_src-8f1ccdacbcfb47fa2eeb6c7e748f55c7ae4bafec.tar.gz chromium_src-8f1ccdacbcfb47fa2eeb6c7e748f55c7ae4bafec.tar.bz2 | |
Resubmit http://codereview.chromium.org/2096008/show
now that ANGLE has been updated or gcc 4.4.1
TEST=none
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47721 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', ], |