summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc
diff options
context:
space:
mode:
authorkkinnunen <kkinnunen@nvidia.com>2015-09-01 23:05:36 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-02 06:06:14 +0000
commite3237bbb682e52f92d5bd18dcab672677e4e3bc4 (patch)
tree39e9b2acf549b3ae3cca0eea94308bbaf9eb73db /gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc
parentbb28823098186a89a079a4c4a1b6b343638ba652 (diff)
downloadchromium_src-e3237bbb682e52f92d5bd18dcab672677e4e3bc4.zip
chromium_src-e3237bbb682e52f92d5bd18dcab672677e4e3bc4.tar.gz
chromium_src-e3237bbb682e52f92d5bd18dcab672677e4e3bc4.tar.bz2
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 Review URL: https://codereview.chromium.org/1231673006 Cr-Commit-Position: refs/heads/master@{#346847}
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.cc3
1 files changed, 2 insertions, 1 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 9d36a26..8268b66 100644
--- a/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc
+++ b/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc
@@ -44,7 +44,8 @@ TEST_F(GLChromiumFramebufferMultisampleTest, CachedBindingsTest) {
}
TEST_F(GLChromiumFramebufferMultisampleTest, DrawAndResolve) {
- if (!GLTestHelper::HasExtension("GL_CHROMIUM_framebuffer_multisample")) {
+ if (!(GLTestHelper::HasExtension("GL_CHROMIUM_framebuffer_multisample") &&
+ GLTestHelper::HasExtension("GL_OES_rgb8_rgba8"))) {
return;
}