Do not try to use GL_texture_rectangle on GL ES

src/gpu/gl/GrGLCaps.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGLCaps.h"
 
@@ skipping 208 matching lines @@
     if (ctxInfo.hasExtension("GL_OES_EGL_image_external")) {
         if (ctxInfo.glslGeneration() == k110_GrGLSLGeneration) {
             fExternalTextureSupport = true;
         } else if (ctxInfo.hasExtension("GL_OES_EGL_image_external_essl3") ||
                    ctxInfo.hasExtension("OES_EGL_image_external_essl3")) {
             // At least one driver has been found that has this extension without the "GL_" prefix.
             fExternalTextureSupport = true;
         }
     }
 
-    if ((kGL_GrGLStandard == standard && version >= GR_GL_VER(3, 1)) ||
-        ctxInfo.hasExtension("GL_ARB_texture_rectangle")) {
-        // We also require textureSize() support for rectangle 2D samplers which was added in GLSL
-        // 1.40.
-        if (ctxInfo.glslGeneration() >= k140_GrGLSLGeneration) {

[Kimmo Kinnunen, 2016/02/15 07:00:41]

Soo.. doesn't this kind of mean that it is disabled today, too? So what would be
the harm in disabling it the other way?

-            fRectangleTextureSupport = true;
-        }
-    }
-
     if (kGL_GrGLStandard == standard) {
+        if (version >= GR_GL_VER(3, 1) || ctxInfo.hasExtension("GL_ARB_texture_rectangle")) {
+            // We also require textureSize() support for rectangle 2D samplers which was added in
+            // GLSL 1.40.
+            if (ctxInfo.glslGeneration() >= k140_GrGLSLGeneration) {
+                fRectangleTextureSupport = true;
+            }
+        }
+    } else {
+        // Command buffer exposes this in GL ES context for Chromium reasons,
+        // but it should not be used. Also, at the time of writing command buffer
+        // lacks TexImage2D support and ANGLE lacks GL ES 3.0 support.
+    }
+
+    if (kGL_GrGLStandard == standard) {
         if (version >= GR_GL_VER(3,3) || ctxInfo.hasExtension("GL_ARB_texture_swizzle")) {
             fTextureSwizzleSupport = true;
         }
     } else {
         if (version >= GR_GL_VER(3,0)) {
             fTextureSwizzleSupport = true;
         }
     }
 
 #ifdef SK_BUILD_FOR_WIN
@@ skipping 1415 matching lines @@
         for (int j = 0; j < kExternalFormatUsageCnt; ++j) {
             SkASSERT(defaultEntry.fFormats.fExternalFormat[j] !=
                      fConfigTable[i].fFormats.fExternalFormat[j]);
         }
         SkASSERT(defaultEntry.fFormats.fExternalType != fConfigTable[i].fFormats.fExternalType);
     }
 #endif
 }
 
 void GrGLCaps::onApplyOptionsOverrides(const GrContextOptions& options) {}