Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Unified Diff: src/gpu/gl/GrGLInterface.cpp

Issue 23404002: Add support for ES3 MSAA. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/gpu/gl/GrGLInterface.cpp
===================================================================
--- src/gpu/gl/GrGLInterface.cpp (revision 10891)
+++ src/gpu/gl/GrGLInterface.cpp (working copy)
@@ -324,25 +324,45 @@
}
}
} else {
+#if GR_GL_IGNORE_ES3_MSAA
robertphillips 2013/08/23 17:25:34 can we share the second two if blocks between the
bsalomon 2013/08/23 17:28:49 I think not, see responses below. The plan is to d
if (extensions.has("GL_CHROMIUM_framebuffer_multisample")) {
if (NULL == fRenderbufferStorageMultisample ||
NULL == fBlitFramebuffer) {
return false;
}
+ } else if (extensions.has("GL_APPLE_framebuffer_multisample")) {
robertphillips 2013/08/23 17:25:34 why not fRenderbufferStorageMultisampleES2APPLE?
bsalomon 2013/08/23 17:28:49 That doesn't exist when GR_GL_IGNORE_ES3_MSAA is t
+ 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")) {
robertphillips 2013/08/23 17:25:34 why not fRenderbufferStorageMultisampleES2EXT?
bsalomon 2013/08/23 17:28:49 ditto
+ 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) {
+ return false;
+ }
+ }
if (extensions.has("GL_APPLE_framebuffer_multisample")) {
- if (NULL == fRenderbufferStorageMultisample ||
+ if (NULL == fRenderbufferStorageMultisampleES2APPLE ||
NULL == fResolveMultisampleFramebuffer) {
return false;
}
}
if (extensions.has("GL_IMG_multisampled_render_to_texture") ||
extensions.has("GL_EXT_multisampled_render_to_texture")) {
- if (NULL == fRenderbufferStorageMultisample ||
+ if (NULL == fRenderbufferStorageMultisampleES2EXT ||
NULL == fFramebufferTexture2DMultisample) {
return false;
}
}
+#endif
}
// On ES buffer mapping is an extension. On Desktop

Powered by Google App Engine
This is Rietveld 408576698