Don't enable shader extenstions in WebGL 2 when they are already core.

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ skipping 3184 matching lines @@
   resources.MaxCallStackDepth = 256;
   resources.MaxDualSourceDrawBuffers = group_->max_dual_source_draw_buffers();
 
   GLint range[2] = { 0, 0 };
   GLint precision = 0;
   GetShaderPrecisionFormatImpl(GL_FRAGMENT_SHADER, GL_HIGH_FLOAT,
                                range, &precision);
   resources.FragmentPrecisionHigh =
       PrecisionMeetsSpecForHighpFloat(range[0], range[1], precision);
 
-  if (feature_info_->IsWebGLContext()) {
-    resources.OES_standard_derivatives = derivatives_explicitly_enabled_;
-    resources.EXT_frag_depth = frag_depth_explicitly_enabled_;
-    resources.EXT_draw_buffers = draw_buffers_explicitly_enabled_;
-    if (!draw_buffers_explicitly_enabled_)
-      resources.MaxDrawBuffers = 1;
-    resources.EXT_shader_texture_lod = shader_texture_lod_explicitly_enabled_;
-    resources.NV_draw_buffers =
-        draw_buffers_explicitly_enabled_ && features().nv_draw_buffers;
-  } else {
-    resources.OES_standard_derivatives =
-        features().oes_standard_derivatives ? 1 : 0;
-    resources.ARB_texture_rectangle =
-        features().arb_texture_rectangle ? 1 : 0;
-    resources.OES_EGL_image_external =
-        features().oes_egl_image_external ? 1 : 0;
-    resources.EXT_draw_buffers =
-        features().ext_draw_buffers ? 1 : 0;
-    resources.EXT_frag_depth =
-        features().ext_frag_depth ? 1 : 0;
-    resources.EXT_shader_texture_lod =
-        features().ext_shader_texture_lod ? 1 : 0;
-    resources.NV_draw_buffers =
-        features().nv_draw_buffers ? 1 : 0;
-    resources.EXT_blend_func_extended =
-        features().ext_blend_func_extended ? 1 : 0;
-  }
-
   ShShaderSpec shader_spec;
   switch (feature_info_->context_type()) {
     case CONTEXT_TYPE_WEBGL1:
       shader_spec = SH_WEBGL_SPEC;
+      resources.OES_standard_derivatives = derivatives_explicitly_enabled_;
+      resources.EXT_frag_depth = frag_depth_explicitly_enabled_;
+      resources.EXT_draw_buffers = draw_buffers_explicitly_enabled_;
+      if (!draw_buffers_explicitly_enabled_)
+        resources.MaxDrawBuffers = 1;
+      resources.EXT_shader_texture_lod = shader_texture_lod_explicitly_enabled_;
+      resources.NV_draw_buffers =
+          draw_buffers_explicitly_enabled_ && features().nv_draw_buffers;
       break;
     case CONTEXT_TYPE_WEBGL2:
       shader_spec = SH_WEBGL2_SPEC;
       break;
     case CONTEXT_TYPE_OPENGLES2:
       shader_spec = SH_GLES2_SPEC;
+      resources.OES_standard_derivatives =
+          features().oes_standard_derivatives ? 1 : 0;
+      resources.ARB_texture_rectangle =
+          features().arb_texture_rectangle ? 1 : 0;
+      resources.OES_EGL_image_external =
+          features().oes_egl_image_external ? 1 : 0;
+      resources.EXT_draw_buffers =
+          features().ext_draw_buffers ? 1 : 0;
+      resources.EXT_frag_depth =
+          features().ext_frag_depth ? 1 : 0;
+      resources.EXT_shader_texture_lod =
+          features().ext_shader_texture_lod ? 1 : 0;
+      resources.NV_draw_buffers =
+          features().nv_draw_buffers ? 1 : 0;
+      resources.EXT_blend_func_extended =
+          features().ext_blend_func_extended ? 1 : 0;
       break;
     case CONTEXT_TYPE_OPENGLES3:
       shader_spec = SH_GLES3_SPEC;
+      resources.ARB_texture_rectangle =
+          features().arb_texture_rectangle ? 1 : 0;
+      resources.OES_EGL_image_external =
+          features().oes_egl_image_external ? 1 : 0;
+      resources.EXT_blend_func_extended =
+          features().ext_blend_func_extended ? 1 : 0;
       break;
     default:
       NOTREACHED();
       shader_spec = SH_GLES2_SPEC;
       break;
   }
 
   if (((shader_spec == SH_WEBGL_SPEC || shader_spec == SH_WEBGL2_SPEC) &&
        features().enable_shader_name_hashing) ||
       force_shader_name_hashing_for_test)
@@ skipping 6722 matching lines @@
     case GL_VENDOR:
       // Return the unmasked VENDOR/RENDERER string for WebGL contexts.
       // They are used by WEBGL_debug_renderer_info.
       if (!feature_info_->IsWebGLContext())
         str = "Chromium";
       else
         str = reinterpret_cast<const char*>(glGetString(name));
       break;
     case GL_EXTENSIONS:
       {
-        // For WebGL contexts, strip out the OES derivatives and
-        // EXT frag depth extensions if they have not been enabled.
+        // For WebGL contexts, strip out shader extensions if they have not
+        // been enabled on WebGL1 or no longer exist (become core) in WebGL2.
         if (feature_info_->IsWebGLContext()) {
           extensions = feature_info_->extensions();
           if (!derivatives_explicitly_enabled_) {
             size_t offset = extensions.find(kOESDerivativeExtension);
             if (std::string::npos != offset) {
               extensions.replace(offset, arraysize(kOESDerivativeExtension),
                                  std::string());
             }
           }
           if (!frag_depth_explicitly_enabled_) {
@@ skipping 2323 matching lines @@
   }
   std::string feature_str;
   if (!bucket->GetAsString(&feature_str)) {
     return error::kInvalidArguments;
   }
 
   bool desire_standard_derivatives = false;
   bool desire_frag_depth = false;
   bool desire_draw_buffers = false;
   bool desire_shader_texture_lod = false;
-  if (feature_info_->IsWebGLContext()) {
+  if (feature_info_->context_type() == CONTEXT_TYPE_WEBGL1) {
     desire_standard_derivatives =
         feature_str.find("GL_OES_standard_derivatives") != std::string::npos;
     desire_frag_depth =
         feature_str.find("GL_EXT_frag_depth") != std::string::npos;
     desire_draw_buffers =
         feature_str.find("GL_EXT_draw_buffers") != std::string::npos;
     desire_shader_texture_lod =
         feature_str.find("GL_EXT_shader_texture_lod") != std::string::npos;
   }
 
@@ skipping 3230 matching lines @@
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "base/macros.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu