summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-17 19:34:11 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-17 19:34:11 +0000
commitf0c876035d1f0bd3dc4917e07697c70a93920f00 (patch)
tree94221124dc594c79b458104764a2817a1f76d89d /gpu/command_buffer/service
parent9c7830ba58277583ca0907237b7ab50b7d671aec (diff)
downloadchromium_src-f0c876035d1f0bd3dc4917e07697c70a93920f00.zip
chromium_src-f0c876035d1f0bd3dc4917e07697c70a93920f00.tar.gz
chromium_src-f0c876035d1f0bd3dc4917e07697c70a93920f00.tar.bz2
Apply shader short circuit workaround on MacOSX
BUG=307751 TEST=conformance test mentioned in the crbug R=bajones@chromium.org, kbr@chromium.org Review URL: https://codereview.chromium.org/27343003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service')
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index f53120b..4dbae41 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2550,6 +2550,8 @@ bool GLES2DecoderImpl::InitializeShaderTranslator() {
driver_bug_workarounds |= SH_EMULATE_BUILT_IN_FUNCTIONS;
if (workarounds().init_gl_position_in_vertex_shader)
driver_bug_workarounds |= SH_INIT_GL_POSITION;
+ if (workarounds().unfold_short_circuit_as_ternary_operation)
+ driver_bug_workarounds |= SH_UNFOLD_SHORT_CIRCUIT;
ShaderTranslatorCache* cache = ShaderTranslatorCache::GetInstance();
vertex_translator_ = cache->GetTranslator(