Disabled extensions in bug list now automatically removes the extension.

ui/gl/gl_gl_api_implementation.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 "ui/gl/gl_gl_api_implementation.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 395 matching lines @@
 
 void RealGLApi::Initialize(DriverGL* driver) {
   InitializeWithCommandLine(driver, base::CommandLine::ForCurrentProcess());
 }
 
 void RealGLApi::InitializeWithCommandLine(DriverGL* driver,
                                           base::CommandLine* command_line) {
   DCHECK(command_line);
   InitializeBase(driver);
 
-  DCHECK(filtered_exts_.empty() && filtered_exts_str_.empty());
-
   const std::string disabled_extensions = command_line->GetSwitchValueASCII(
       switches::kDisableGLExtensions);
   if (!disabled_extensions.empty()) {
-    std::vector<std::string> disabled_extensions_vec;
-    Tokenize(disabled_extensions, ", ;", &disabled_extensions_vec);
-
-    // Fill in filtered_exts_ vector first.
-    if (gfx::GetGLImplementation() !=
-        gfx::kGLImplementationDesktopGLCoreProfile) {
-      const char* gl_extensions = reinterpret_cast<const char*>(
-          GLApiBase::glGetStringFn(GL_EXTENSIONS));
-      if (gl_extensions)
-        base::SplitString(gl_extensions, ' ', &filtered_exts_);
-    } else {
-      GLint num_extensions = 0;
-      GLApiBase::glGetIntegervFn(GL_NUM_EXTENSIONS, &num_extensions);
-      for (GLint i = 0; i < num_extensions; ++i) {
-        const char* gl_extension = reinterpret_cast<const char*>(
-            GLApiBase::glGetStringiFn(GL_EXTENSIONS, i));
-        DCHECK(gl_extension != NULL);
-        filtered_exts_.push_back(gl_extension);
-      }
-    }
-
-    // Filter out extensions from the command line.
-    for (const std::string& disabled_ext : disabled_extensions_vec) {
-      filtered_exts_.erase(std::remove(filtered_exts_.begin(),
-                                       filtered_exts_.end(),
-                                       disabled_ext),
-                           filtered_exts_.end());
-    }
-
-    // Construct filtered extensions string for GL_EXTENSIONS string lookups.
-    filtered_exts_str_ = JoinString(filtered_exts_, " ");
+    Tokenize(disabled_extensions, ", ;", &disabled_exts_);
   }
 }
 
 void RealGLApi::glGetIntegervFn(GLenum pname, GLint* params) {
+  InitializeFilteredExtensions();

[no sievers, 2015/05/15 18:31:51]

Why this change and make this initialization lazy now?

[no sievers, 2015/05/15 23:58:56]

Still wondering about this change.

[David Yen, 2015/05/16 00:01:31]

Sorry, I wrote about it in my first message. I had to defer the GL_Extensions
filtering code because we have
to be sure the GL Context is activated before we can call glGetString()...etc.

[no sievers, 2015/05/16 00:17:19]

Can you do it from InitializeCustomDynamicBindings() instead?

[David Yen, 2015/05/18 17:08:48]

InitializeCustomDynamicBindings() is a DriverGL function, do you mean
InitializeDynamicGLBindingsGL? Could you give an example of what it would look
like? Do you mean to make InitializeFilteredExtensions() some standard virtual
function inside of GLApi which gets called from InitializeDynamicGLBindingsGL()?

[no sievers, 2015/05/18 18:19:32]

Can you call g_real_gl->InitializeWithContext() or whatever from
InitializeDynamicGLBindingsGL()? Then it doesn't even have to be virtual.

But wait, you raise a good point. What about the VirtualGLApi, how do we make
that work? And since you are adding the Qualcomm workaround - on that driver we
use virtual contexts. So does this only work accidentally to the extent that we
have the real, and not virtual, API current when we first query extensions?

[David Yen, 2015/05/18 18:23:37]

I'll try the g_real_gl method.

Virtual contexts work because upon Initialize() it calls
real_context->GetExtensions() for the extensions.

   if (!filtered_exts_.empty() && pname == GL_NUM_EXTENSIONS) {
     *params = static_cast<GLint>(filtered_exts_.size());
   } else {
     GLApiBase::glGetIntegervFn(pname, params);
   }
 }
 
 const GLubyte* RealGLApi::glGetStringFn(GLenum name) {
+  InitializeFilteredExtensions();
   if (!filtered_exts_.empty() && name == GL_EXTENSIONS) {
     return reinterpret_cast<const GLubyte*>(filtered_exts_str_.c_str());
   }
   return GLApiBase::glGetStringFn(name);
 }
 
 const GLubyte* RealGLApi::glGetStringiFn(GLenum name, GLuint index) {
+  InitializeFilteredExtensions();
   if (!filtered_exts_str_.empty() && name == GL_EXTENSIONS) {
     if (index >= filtered_exts_.size()) {
       return NULL;
     }
     return reinterpret_cast<const GLubyte*>(filtered_exts_[index].c_str());
   }
   return GLApiBase::glGetStringiFn(name, index);
 }
 
 void RealGLApi::glFlushFn() {
   GLApiBase::glFlushFn();
 }
 
 void RealGLApi::glFinishFn() {
   GLApiBase::glFinishFn();
 }
 
+void RealGLApi::InitializeFilteredExtensions() {
+  if (!disabled_exts_.empty() && filtered_exts_.empty()) {
+    DCHECK(filtered_exts_.empty() && filtered_exts_str_.empty());
+    // Fill in filtered_exts_ vector first.
+    if (gfx::GetGLImplementation() !=
+        gfx::kGLImplementationDesktopGLCoreProfile) {
+      const char* gl_extensions = reinterpret_cast<const char*>(
+          GLApiBase::glGetStringFn(GL_EXTENSIONS));
+      if (gl_extensions)
+        base::SplitString(gl_extensions, ' ', &filtered_exts_);
+    } else {
+      GLint num_extensions = 0;
+      GLApiBase::glGetIntegervFn(GL_NUM_EXTENSIONS, &num_extensions);
+      for (GLint i = 0; i < num_extensions; ++i) {
+        const char* gl_extension = reinterpret_cast<const char*>(
+            GLApiBase::glGetStringiFn(GL_EXTENSIONS, i));
+        DCHECK(gl_extension != NULL);
+        filtered_exts_.push_back(gl_extension);
+      }
+    }
+
+    // Filter out extensions from the command line.
+    for (const std::string& disabled_ext : disabled_exts_) {
+      filtered_exts_.erase(std::remove(filtered_exts_.begin(),
+                                       filtered_exts_.end(),
+                                       disabled_ext),
+                           filtered_exts_.end());
+    }
+
+    // Construct filtered extensions string for GL_EXTENSIONS string lookups.
+    filtered_exts_str_ = JoinString(filtered_exts_, " ");
+  }
+}
+
 TraceGLApi::~TraceGLApi() {
 }
 
 NoContextGLApi::NoContextGLApi() {
 }
 
 NoContextGLApi::~NoContextGLApi() {
 }
 
 VirtualGLApi::VirtualGLApi()
@@ skipping 104 matching lines @@
 ScopedSetGLToRealGLApi::ScopedSetGLToRealGLApi()
     : old_gl_api_(GetCurrentGLApi()) {
   SetGLToRealGLApi();
 }
 
 ScopedSetGLToRealGLApi::~ScopedSetGLToRealGLApi() {
   SetGLApi(old_gl_api_);
 }
 
 }  // namespace gfx