summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorccameron <ccameron@chromium.org>2015-06-16 12:59:30 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-16 20:00:03 +0000
commitbdc507d4498c61d4c995c82118ab287d0298608f (patch)
tree52e621f432e6541a1b0a8a8228119fd018b1688d /gpu
parent8a219eabd69a669085561bcf2106e2e7d63ee83b (diff)
downloadchromium_src-bdc507d4498c61d4c995c82118ab287d0298608f.zip
chromium_src-bdc507d4498c61d4c995c82118ab287d0298608f.tar.gz
chromium_src-bdc507d4498c61d4c995c82118ab287d0298608f.tar.bz2
Mac: Add GPU driver workaround for NSCGLSurface on multi-GPU
The NSCGLSurface API is not reliable on multi-GPU systems. Disallow use of this API multi-GPU systems. BUG=496484 Review URL: https://codereview.chromium.org/1179153004 Cr-Commit-Position: refs/heads/master@{#334668}
Diffstat (limited to 'gpu')
-rw-r--r--gpu/config/gpu_driver_bug_list_json.cc17
-rw-r--r--gpu/config/gpu_driver_bug_workaround_type.h2
2 files changed, 18 insertions, 1 deletions
diff --git a/gpu/config/gpu_driver_bug_list_json.cc b/gpu/config/gpu_driver_bug_list_json.cc
index 28c102c0..987138e 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": "8.13",
+ "version": "8.14",
"entries": [
{
"id": 1,
@@ -1441,6 +1441,21 @@ LONG_STRING_CONST(
"features": [
"max_copy_texture_chromium_size_262144"
]
+ },
+ {
+ "id": 121,
+ "description": "NSCGLSurface API is buggy on multi-GPU systems",
+ "cr_bugs": [496484],
+ "os": {
+ "type": "macosx"
+ },
+ "gpu_count": {
+ "op": ">",
+ "value": "1"
+ },
+ "features": [
+ "disable_ns_cgl_surface_api"
+ ]
}
]
}
diff --git a/gpu/config/gpu_driver_bug_workaround_type.h b/gpu/config/gpu_driver_bug_workaround_type.h
index 9cf6d05..c5c9b83 100644
--- a/gpu/config/gpu_driver_bug_workaround_type.h
+++ b/gpu/config/gpu_driver_bug_workaround_type.h
@@ -40,6 +40,8 @@
disable_multimonitor_multisampling) \
GPU_OP(DISABLE_MULTISAMPLED_RENDER_TO_TEXTURE, \
disable_multisampled_render_to_texture) \
+ GPU_OP(DISABLE_NS_CGL_SURFACE_API, \
+ disable_ns_cgl_surface_api) \
GPU_OP(DISABLE_POST_SUB_BUFFERS_FOR_ONSCREEN_SURFACES, \
disable_post_sub_buffers_for_onscreen_surfaces) \
GPU_OP(ETC1_POWER_OF_TWO_ONLY, \