Remove GR_GL_IGNORE_ES3_MSAA.s

src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp

 // Modified from chromium/src/webkit/glue/gl_bindings_skia_cmd_buffer.cc
 
 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gl/GrGLExtensions.h"
 #include "gl/GrGLInterface.h"
 #include "gl/GrGLUtil.h"
 
@@ skipping 129 matching lines @@
     interface->fVertexAttrib4fv = glVertexAttrib4fv;
     interface->fVertexAttribPointer = glVertexAttribPointer;
     interface->fViewport = glViewport;
     interface->fBindFramebuffer = glBindFramebuffer;
     interface->fBindRenderbuffer = glBindRenderbuffer;
     interface->fCheckFramebufferStatus = glCheckFramebufferStatus;
     interface->fDeleteFramebuffers = glDeleteFramebuffers;
     interface->fDeleteRenderbuffers = glDeleteRenderbuffers;
     interface->fFramebufferRenderbuffer = glFramebufferRenderbuffer;
     interface->fFramebufferTexture2D = glFramebufferTexture2D;
-#if GR_GL_IGNORE_ES3_MSAA
+
+    if (version >= GR_GL_VER(3,0)) {

[bsalomon, 2014/01/16 19:49:58]

The change here was to delete the #if GR_GL_IGNORE_ES3_MSAA block and then fix
the indentation in the #else block.

+#if GL_ES_VERSION_3_0
+        interface->fRenderbufferStorageMultisample = glRenderbufferStorageMultisample;
+        interface->fBlitFramebuffer = glBlitFramebuffer;
+#else
+        interface->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisample");
+        interface->fBlitFramebuffer = (GrGLBlitFramebufferProc) eglGetProcAddress("glBlitFramebuffer");
+#endif
+    }
 
     if (extensions.has("GL_EXT_multisampled_render_to_texture")) {
 #if GL_EXT_multisampled_render_to_texture
         interface->fFramebufferTexture2DMultisample = glFramebufferTexture2DMultisampleEXT;
-        interface->fRenderbufferStorageMultisample = glRenderbufferStorageMultisampleEXT;
+        interface->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorageMultisampleEXT;
 #else
         interface->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DMultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleEXT");
-        interface->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleEXT");
+        interface->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleEXT");
 #endif
     } else if (extensions.has("GL_IMG_multisampled_render_to_texture")) {
 #if GL_IMG_multisampled_render_to_texture
         interface->fFramebufferTexture2DMultisample = glFramebufferTexture2DMultisampleIMG;
-        interface->fRenderbufferStorageMultisample = glRenderbufferStorageMultisampleIMG;
+        interface->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorageMultisampleIMG;
 #else
         interface->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DMultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleIMG");
-        interface->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleIMG");
+        interface->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleIMG");
 #endif
     }
 
-#else // GR_GL_IGNORE_ES3_MSAA
-
-        if (version >= GR_GL_VER(3,0)) {
-#if GL_ES_VERSION_3_0
-            interface->fRenderbufferStorageMultisample = glRenderbufferStorageMultisample;
-            interface->fBlitFramebuffer = glBlitFramebuffer;
-#else
-            interface->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisample");
-            interface->fBlitFramebuffer = (GrGLBlitFramebufferProc) eglGetProcAddress("glBlitFramebuffer");
-#endif
-        }
-        if (extensions.has("GL_EXT_multisampled_render_to_texture")) {
-#if GL_EXT_multisampled_render_to_texture
-            interface->fFramebufferTexture2DMultisample = glFramebufferTexture2DMultisampleEXT;
-            interface->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorageMultisampleEXT;
-#else
-            interface->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DMultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleEXT");
-            interface->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleEXT");
-#endif
-        } else if (extensions.has("GL_IMG_multisampled_render_to_texture")) {
-#if GL_IMG_multisampled_render_to_texture
-            interface->fFramebufferTexture2DMultisample = glFramebufferTexture2DMultisampleIMG;
-            interface->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorageMultisampleIMG;
-#else
-            interface->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DMultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleIMG");
-            interface->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleIMG");
-#endif
-        }
-
-#endif // GR_GL_IGNORE_ES3_MSAA
     interface->fGenFramebuffers = glGenFramebuffers;
     interface->fGenRenderbuffers = glGenRenderbuffers;
     interface->fGetFramebufferAttachmentParameteriv = glGetFramebufferAttachmentParameteriv;
     interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;
     interface->fRenderbufferStorage = glRenderbufferStorage;
 #if GL_OES_mapbuffer
     interface->fMapBuffer = glMapBufferOES;
     interface->fUnmapBuffer = glUnmapBufferOES;
 #else
     interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOES");
@@ skipping 215 matching lines @@
     }
 
     if (kGLES_GrGLStandard == standard) {
         return create_es_interface(version, extensions);
     } else if (kGL_GrGLStandard == standard) {
         return create_desktop_interface(version, extensions);
     } else {
         return NULL;
     }
 }