summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 11:17:05 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 11:17:05 +0000
commitb03219d2375c0ce304e921098e5782a41fa0fb1d (patch)
tree635aa2d40559620099aebf1609d7c11e5ce8f379 /gpu
parent6cbf73ffc21a558a99214bff8b405f1990bb0639 (diff)
downloadchromium_src-b03219d2375c0ce304e921098e5782a41fa0fb1d.zip
chromium_src-b03219d2375c0ce304e921098e5782a41fa0fb1d.tar.gz
chromium_src-b03219d2375c0ce304e921098e5782a41fa0fb1d.tar.bz2
Enable mac driver bug workaround init_varyings_without_static_use.
BUG=322760 TEST=webgl conformance tests R=kbr@chromium.org,bajones@chromium.org Review URL: https://codereview.chromium.org/143823020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc2
-rw-r--r--gpu/config/gpu_driver_bug_list_json.cc13
-rw-r--r--gpu/config/gpu_driver_bug_workaround_type.h2
3 files changed, 16 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 71a0f42..2c99896 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2655,6 +2655,8 @@ bool GLES2DecoderImpl::InitializeShaderTranslator() {
driver_bug_workarounds |= SH_INIT_GL_POSITION;
if (workarounds().unfold_short_circuit_as_ternary_operation)
driver_bug_workarounds |= SH_UNFOLD_SHORT_CIRCUIT;
+ if (workarounds().init_varyings_without_static_use)
+ driver_bug_workarounds |= SH_INIT_VARYINGS_WITHOUT_STATIC_USE;
ShaderTranslatorCache* cache = ShaderTranslatorCache::GetInstance();
vertex_translator_ = cache->GetTranslator(
diff --git a/gpu/config/gpu_driver_bug_list_json.cc b/gpu/config/gpu_driver_bug_list_json.cc
index 7e41481..0cecdc7 100644
--- a/gpu/config/gpu_driver_bug_list_json.cc
+++ b/gpu/config/gpu_driver_bug_list_json.cc
@@ -19,7 +19,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
{
"name": "gpu driver bug list",
// Please update the version number whenever you change this file.
- "version": "3.10",
+ "version": "3.11",
"entries": [
{
"id": 1,
@@ -745,6 +745,17 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
"features": [
"count_all_in_varyings_packing"
]
+ },
+ {
+ "id": 57,
+ "cr_bugs": [322760],
+ "description": "Mac drivers handle varyings without static use incorrectly",
+ "os": {
+ "type": "macosx"
+ },
+ "features": [
+ "init_varyings_without_static_use"
+ ]
}
]
}
diff --git a/gpu/config/gpu_driver_bug_workaround_type.h b/gpu/config/gpu_driver_bug_workaround_type.h
index e48eeff..c204260 100644
--- a/gpu/config/gpu_driver_bug_workaround_type.h
+++ b/gpu/config/gpu_driver_bug_workaround_type.h
@@ -46,6 +46,8 @@
force_integrated_gpu) \
GPU_OP(INIT_GL_POSITION_IN_VERTEX_SHADER, \
init_gl_position_in_vertex_shader) \
+ GPU_OP(INIT_VARYINGS_WITHOUT_STATIC_USE, \
+ init_varyings_without_static_use) \
GPU_OP(MAX_CUBE_MAP_TEXTURE_SIZE_LIMIT_1024, \
max_cube_map_texture_size_limit_1024) \
GPU_OP(MAX_CUBE_MAP_TEXTURE_SIZE_LIMIT_4096, \