diff options
| author | senorblanco <senorblanco@chromium.org> | 2015-04-01 17:18:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-02 00:18:38 +0000 |
| commit | 06b150ca1c0b879ec345b5ee8005b672c5f62667 (patch) | |
| tree | bb900fb0edb1ce89a740d2585b37a185a22f44c6 /gpu/config | |
| parent | 04ad0b20a47b9a04c4398050e2825c1e1e9dd8f0 (diff) | |
| download | chromium_src-06b150ca1c0b879ec345b5ee8005b672c5f62667.zip chromium_src-06b150ca1c0b879ec345b5ee8005b672c5f62667.tar.gz chromium_src-06b150ca1c0b879ec345b5ee8005b672c5f62667.tar.bz2 | |
Break up disable_multisampling blacklist entry.
Split disable_multisampling blacklist entry into
disable_chromium_framebuffer_multisample and
disable_framebuffer_texture_multisample.
BUG=449116
Review URL: https://codereview.chromium.org/1050613003
Cr-Commit-Position: refs/heads/master@{#323375}
Diffstat (limited to 'gpu/config')
| -rw-r--r-- | gpu/config/gpu_driver_bug_list_json.cc | 15 | ||||
| -rw-r--r-- | gpu/config/gpu_driver_bug_list_unittest.cc | 6 | ||||
| -rw-r--r-- | gpu/config/gpu_driver_bug_workaround_type.h | 6 |
3 files changed, 15 insertions, 12 deletions
diff --git a/gpu/config/gpu_driver_bug_list_json.cc b/gpu/config/gpu_driver_bug_list_json.cc index 6c4064f..ac96ec0 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": "7.17", + "version": "7.18", "entries": [ { "id": 1, @@ -607,7 +607,8 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST( }, "gl_vendor": "Qualcomm.*", "features": [ - "disable_multisampling" + "disable_chromium_framebuffer_multisample", + "disable_multisampled_render_to_texture" ] }, { @@ -677,7 +678,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST( }, "vendor_id": "0x1002", "features": [ - "disable_multisampling" + "disable_chromium_framebuffer_multisample" ] }, { @@ -690,7 +691,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST( "vendor_id": "0x8086", "device_id": ["0x0152", "0x0156", "0x015a", "0x0162", "0x0166"], "features": [ - "disable_multisampling" + "disable_chromium_framebuffer_multisample" ] }, { @@ -705,7 +706,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST( } }, "features": [ - "disable_multisampling" + "disable_chromium_framebuffer_multisample" ] }, { @@ -865,7 +866,7 @@ LONG_STRING_CONST( "gl_vendor": "ARM.*", "gl_renderer": ".*Mali-400.*", "features": [ - "disable_multisampling" + "disable_multisampled_render_to_texture" ] }, { @@ -1103,7 +1104,7 @@ LONG_STRING_CONST( "gl_vendor": "Intel", "gl_renderer": "Intel.*BayTrail", "features": [ - "disable_multisampling" + "disable_chromium_framebuffer_multisample" ] }, { diff --git a/gpu/config/gpu_driver_bug_list_unittest.cc b/gpu/config/gpu_driver_bug_list_unittest.cc index 4d62c39..1e4090b 100644 --- a/gpu/config/gpu_driver_bug_list_unittest.cc +++ b/gpu/config/gpu_driver_bug_list_unittest.cc @@ -125,8 +125,8 @@ TEST_F(GpuDriverBugListTest, GpuSwitching) { TEST_F(GpuDriverBugListTest, AppendSingleWorkaround) { base::CommandLine command_line(0, NULL); - command_line.AppendSwitch( - GpuDriverBugWorkaroundTypeToString(DISABLE_MULTISAMPLING)); + command_line.AppendSwitch(GpuDriverBugWorkaroundTypeToString( + DISABLE_CHROMIUM_FRAMEBUFFER_MULTISAMPLE)); std::set<int> workarounds; workarounds.insert(EXIT_ON_CONTEXT_LOST); workarounds.insert(INIT_VERTEX_ATTRIBUTES); @@ -134,7 +134,7 @@ TEST_F(GpuDriverBugListTest, AppendSingleWorkaround) { GpuDriverBugList::AppendWorkaroundsFromCommandLine( &workarounds, command_line); EXPECT_EQ(3u, workarounds.size()); - EXPECT_EQ(1u, workarounds.count(DISABLE_MULTISAMPLING)); + EXPECT_EQ(1u, workarounds.count(DISABLE_CHROMIUM_FRAMEBUFFER_MULTISAMPLE)); } TEST_F(GpuDriverBugListTest, AppendForceGPUWorkaround) { diff --git a/gpu/config/gpu_driver_bug_workaround_type.h b/gpu/config/gpu_driver_bug_workaround_type.h index 462cb83..bf1cf74 100644 --- a/gpu/config/gpu_driver_bug_workaround_type.h +++ b/gpu/config/gpu_driver_bug_workaround_type.h @@ -22,6 +22,8 @@ disable_arb_sync) \ GPU_OP(DISABLE_ASYNC_READPIXELS, \ disable_async_readpixels) \ + GPU_OP(DISABLE_CHROMIUM_FRAMEBUFFER_MULTISAMPLE, \ + disable_chromium_framebuffer_multisample) \ GPU_OP(DISABLE_D3D11, \ disable_d3d11) \ GPU_OP(DISABLE_DEPTH_TEXTURE, \ @@ -40,8 +42,8 @@ disable_fbo_invalidations) \ GPU_OP(DISABLE_MULTIMONITOR_MULTISAMPLING, \ disable_multimonitor_multisampling) \ - GPU_OP(DISABLE_MULTISAMPLING, \ - disable_multisampling) \ + GPU_OP(DISABLE_MULTISAMPLED_RENDER_TO_TEXTURE, \ + disable_multisampled_render_to_texture) \ GPU_OP(DISABLE_OES_STANDARD_DERIVATIVES, \ disable_oes_standard_derivatives) \ GPU_OP(DISABLE_POST_SUB_BUFFERS_FOR_ONSCREEN_SURFACES, \ |