diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 23:28:01 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 23:28:01 +0000 |
| commit | 961f42c5830f4ddff5c42c04b92c1bde4031794f (patch) | |
| tree | b8c756b7378de603db3196bfc5581b9cbf45ece8 | |
| parent | 620d5de5ce769db35a330404001ddcb6fa3a09cf (diff) | |
| download | chromium_src-961f42c5830f4ddff5c42c04b92c1bde4031794f.zip chromium_src-961f42c5830f4ddff5c42c04b92c1bde4031794f.tar.gz chromium_src-961f42c5830f4ddff5c42c04b92c1bde4031794f.tar.bz2 | |
Blacklist EXT_draw_buffers on Mac NVIDIA GeForce GT 650M.
Also, turn on support for EXT_draw_buffers on Windows. To make it easy for debugging ANGLE implementation bugs.
BUG=180397
TEST=gpu_unittests,content_unittests
Review URL: https://codereview.chromium.org/13730008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192647 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/gpu/gpu_driver_bug_list.json | 14 | ||||
| -rw-r--r-- | gpu/command_buffer/service/feature_info.cc | 4 | ||||
| -rw-r--r-- | gpu/command_buffer/service/gpu_driver_bug_workaround_type.h | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/content/browser/gpu/gpu_driver_bug_list.json b/content/browser/gpu/gpu_driver_bug_list.json index c8d948f..7e8eb39 100644 --- a/content/browser/gpu/gpu_driver_bug_list.json +++ b/content/browser/gpu/gpu_driver_bug_list.json @@ -91,7 +91,7 @@ { "name": "gpu driver bug list", // Please update the version number whenever you change this file. - "version": "1.1", + "version": "1.2", "entries": [ { "id": 1, @@ -306,6 +306,18 @@ "features": [ "disable_depth_texture" ] + }, + { + "id": 18, + "os": { + "type": "macosx" + }, + "vendor_id": "0x10de", + "device_id": ["0x0fd5"], + "multi_gpu_category": "any", + "features": [ + "disable_ext_draw_buffers" + ] } ] } diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc index 8516a20..068a132 100644 --- a/gpu/command_buffer/service/feature_info.cc +++ b/gpu/command_buffer/service/feature_info.cc @@ -590,7 +590,9 @@ void FeatureInfo::AddFeatures(const CommandLine& command_line) { validators_.vertex_attribute.AddValue(GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE); } - if (extensions.Contains("GL_ARB_draw_buffers")) { + if (!workarounds_.disable_ext_draw_buffers && + (extensions.Contains("GL_ARB_draw_buffers") || + extensions.Contains("GL_EXT_draw_buffers"))) { AddExtensionString("GL_EXT_draw_buffers"); feature_flags_.ext_draw_buffers = true; diff --git a/gpu/command_buffer/service/gpu_driver_bug_workaround_type.h b/gpu/command_buffer/service/gpu_driver_bug_workaround_type.h index 8c21d2e..0478b28 100644 --- a/gpu/command_buffer/service/gpu_driver_bug_workaround_type.h +++ b/gpu/command_buffer/service/gpu_driver_bug_workaround_type.h @@ -18,6 +18,8 @@ disable_angle_framebuffer_multisample) \ GPU_OP(DISABLE_DEPTH_TEXTURE, \ disable_depth_texture) \ + GPU_OP(DISABLE_EXT_DRAW_BUFFERS, \ + disable_ext_draw_buffers) \ GPU_OP(DISABLE_EXT_OCCLUSION_QUERY, \ disable_ext_occlusion_query) \ GPU_OP(ENABLE_CHROMIUM_FAST_NPOT_MO8_TEXTURES, \ |