diff options
| author | tapted <tapted@chromium.org> | 2016-03-23 21:25:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 04:26:51 +0000 |
| commit | 2804ea7c00e3dbac8d7e374c8537ccef66aae254 (patch) | |
| tree | 63fd0faa53e33348c5a108b14b4cf127bdfa45dd /gpu | |
| parent | 47e7536c8b338698fbbedce5870f6f5512070091 (diff) | |
| download | chromium_src-2804ea7c00e3dbac8d7e374c8537ccef66aae254.zip chromium_src-2804ea7c00e3dbac8d7e374c8537ccef66aae254.tar.gz chromium_src-2804ea7c00e3dbac8d7e374c8537ccef66aae254.tar.bz2 | |
Remove Mac's needs_gl_finish_workaround / gpu::FORCE_GL_FINISH_AFTER_COMPOSITING
It was once in effect for 10.6 and 10.7. But actually the code under
ui/accelerated_widget_mac that would have read the setting to apply the
workaround in IOSurfaceLayer went away in r356129 anyway.
BUG=579255, 546691
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
Review URL: https://codereview.chromium.org/1823553002
Cr-Commit-Position: refs/heads/master@{#383028}
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/tests/gl_cube_map_texture_unittest.cc | 4 | ||||
| -rw-r--r-- | gpu/config/gpu_driver_bug_list_json.cc | 19 | ||||
| -rw-r--r-- | gpu/config/gpu_driver_bug_workaround_type.h | 2 |
3 files changed, 3 insertions, 22 deletions
diff --git a/gpu/command_buffer/tests/gl_cube_map_texture_unittest.cc b/gpu/command_buffer/tests/gl_cube_map_texture_unittest.cc index 56ca62b..b2fb931 100644 --- a/gpu/command_buffer/tests/gl_cube_map_texture_unittest.cc +++ b/gpu/command_buffer/tests/gl_cube_map_texture_unittest.cc @@ -79,7 +79,7 @@ TEST_P(GLCubeMapTextureTest, TexImage2DAfterFBOBinding) { EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError()); glBindTexture(GL_TEXTURE_CUBE_MAP, texture_); - // force_gl_finish_after_compositing workaround prevents Nexus 5 crash. + // force_cube_map_positive_x_allocation workaround prevents Nexus 5 crash. // TODO(dshwang): remove the workaround when it's fixed. crbug.com/518889 glTexImage2D(cube_map_target, 0, GL_RGBA, width_, width_, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels_); @@ -127,7 +127,7 @@ TEST_P(GLCubeMapTextureTest, ReadPixelsFromIncompleteCubeTexture) { glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, cube_map_target, texture_, 0); - // force_gl_finish_after_compositing workaround prevents Nexus 5 crash. + // force_cube_map_positive_x_allocation workaround prevents Nexus 5 crash. // TODO(dshwang): remove the workaround when it's fixed. crbug.com/518889 EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError()); diff --git a/gpu/config/gpu_driver_bug_list_json.cc b/gpu/config/gpu_driver_bug_list_json.cc index cdad501..6109287 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.54", + "version": "8.55", "entries": [ { "id": 1, @@ -753,23 +753,6 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST( ] }, { - "id": 66, - "description": "Force glFinish() after compositing on older OS X on Intel GPU", - "cr_bugs": [123409], - "os": { - "type": "macosx", - "version": { - "op": "<=", - "value": "10.7" - } - }, - "vendor_id": "0x8086", - "multi_gpu_category": "active", - "features": [ - "force_gl_finish_after_compositing" - ] - }, - { "id": 68, "description": "Disable partial swaps on linux drivers", "cr_bugs": [339493], diff --git a/gpu/config/gpu_driver_bug_workaround_type.h b/gpu/config/gpu_driver_bug_workaround_type.h index da2acc9..204d23c 100644 --- a/gpu/config/gpu_driver_bug_workaround_type.h +++ b/gpu/config/gpu_driver_bug_workaround_type.h @@ -64,8 +64,6 @@ force_cube_map_positive_x_allocation) \ GPU_OP(FORCE_DISCRETE_GPU, \ force_discrete_gpu) \ - GPU_OP(FORCE_GL_FINISH_AFTER_COMPOSITING, \ - force_gl_finish_after_compositing) \ GPU_OP(FORCE_INTEGRATED_GPU, \ force_integrated_gpu) \ GPU_OP(GL_BEGIN_GL_END_ON_FBO_CHANGE_TO_BACKBUFFER, \ |