aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/gl/GrGLInterface.cpp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-16 20:49:46 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-16 20:49:46 +0000
commit92b7884e88fc420b6f6ae3589aa3659b6448e005 (patch)
treeba4c612232b1c979a2e715fe4525ea95be4fcd96 /src/gpu/gl/GrGLInterface.cpp
parent58c0fa37bafc220074dfe993a6faab039035e6e6 (diff)
Remove GR_GL_IGNORE_ES3_MSAA.s
R=jvanverth@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/140933005 git-svn-id: http://skia.googlecode.com/svn/trunk@13115 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGLInterface.cpp')
-rw-r--r--src/gpu/gl/GrGLInterface.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp
index 21a66495e5..6e8306b911 100644
--- a/src/gpu/gl/GrGLInterface.cpp
+++ b/src/gpu/gl/GrGLInterface.cpp
@@ -328,25 +328,6 @@ bool GrGLInterface::validate() const {
}
}
} else {
-#if GR_GL_IGNORE_ES3_MSAA
- if (extensions.has("GL_CHROMIUM_framebuffer_multisample")) {
- if (NULL == fRenderbufferStorageMultisample ||
- NULL == fBlitFramebuffer) {
- return false;
- }
- } else if (extensions.has("GL_APPLE_framebuffer_multisample")) {
- if (NULL == fRenderbufferStorageMultisample ||
- NULL == fResolveMultisampleFramebuffer) {
- return false;
- }
- } else if (extensions.has("GL_IMG_multisampled_render_to_texture") ||
- extensions.has("GL_EXT_multisampled_render_to_texture")) {
- if (NULL == fRenderbufferStorageMultisample ||
- NULL == fFramebufferTexture2DMultisample) {
- return false;
- }
- }
-#else
if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_CHROMIUM_framebuffer_multisample")) {
if (NULL == fRenderbufferStorageMultisample ||
NULL == fBlitFramebuffer) {
@@ -366,7 +347,6 @@ bool GrGLInterface::validate() const {
return false;
}
}
-#endif
}
// On ES buffer mapping is an extension. On Desktop