diff options
author | jmadill <jmadill@chromium.org> | 2015-09-08 08:21:21 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-08 15:21:51 +0000 |
commit | cf517079e421da306379c6c05a99705e66ec3240 (patch) | |
tree | 1cfa9fd9f89efb0385dc675d26aaac441038612a /gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc | |
parent | 6bbc8ce24e1f6a3e6060cd22442ffaf9b124d973 (diff) | |
download | chromium_src-cf517079e421da306379c6c05a99705e66ec3240.zip chromium_src-cf517079e421da306379c6c05a99705e66ec3240.tar.gz chromium_src-cf517079e421da306379c6c05a99705e66ec3240.tar.bz2 |
Revert of command_buffer: Implement EXT_multisample_compatibility (patchset #9 id:160001 of https://codereview.chromium.org/1231673006/ )
Reason for revert:
Breaking the EXTMultisampleCompatibilityTest.DrawAndResolve test on AMD.
EXTMultisampleCompatibilityTest.DrawAndResolve:
../../gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc:208: Failure
Value of: r
Actual: '\x80' (128)
Expected: 255u
Which is: 255
../../gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc:209: Failure
Value of: g
Actual: '\x80' (128)
Expected: 0u
Which is: 0
../../gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc:225: Failure
Value of: r
Actual: '\x80' (128)
Expected: 255u
Which is: 255
../../gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc:227: Failure
Value of: b
Actual: '\x80' (128)
Expected: 0u
Which is: 0
Original issue's description:
> command_buffer: Implement EXT_multisample_compatibility
>
> Implement EXT_multisample_compatibility OpenGL ES extension in command
> buffer.
>
> Skia needs this in order to enable and disable multisampling when
> using GL path rendering.
>
> BUG=506765
>
> Committed: https://crrev.com/e3237bbb682e52f92d5bd18dcab672677e4e3bc4
> Cr-Commit-Position: refs/heads/master@{#346847}
>
> Committed: https://crrev.com/28e57fb8caf8c0daf4be0692777aa9229cfdaa8b
> Cr-Commit-Position: refs/heads/master@{#347390}
TBR=vmiura@chromium.org,piman@chromium.org,zmo@google.com,markkilgard@gmail.com,zmo@chromium.org,sievers@google.com,kkinnunen@nvidia.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=506765, 529315
Review URL: https://codereview.chromium.org/1333493004
Cr-Commit-Position: refs/heads/master@{#347705}
Diffstat (limited to 'gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc')
-rw-r--r-- | gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc b/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc index 8268b66..9d36a26 100644 --- a/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc +++ b/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc @@ -44,8 +44,7 @@ TEST_F(GLChromiumFramebufferMultisampleTest, CachedBindingsTest) { } TEST_F(GLChromiumFramebufferMultisampleTest, DrawAndResolve) { - if (!(GLTestHelper::HasExtension("GL_CHROMIUM_framebuffer_multisample") && - GLTestHelper::HasExtension("GL_OES_rgb8_rgba8"))) { + if (!GLTestHelper::HasExtension("GL_CHROMIUM_framebuffer_multisample")) { return; } |