diff options
| author | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 12:13:08 +0000 |
|---|---|---|
| committer | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 12:13:08 +0000 |
| commit | 25afcfe213ffd88f8e9370d4ff1ee23ecf9ae16c (patch) | |
| tree | 231cbf5a41324ba641db9c7af4913bf416c897e2 /ui/gl/gl_implementation.cc | |
| parent | 7d0cce0355811619fb78e00a1aaf0d04b103c98a (diff) | |
| download | chromium_src-25afcfe213ffd88f8e9370d4ff1ee23ecf9ae16c.zip chromium_src-25afcfe213ffd88f8e9370d4ff1ee23ecf9ae16c.tar.gz chromium_src-25afcfe213ffd88f8e9370d4ff1ee23ecf9ae16c.tar.bz2 | |
Revert 164047 - Make GL calls go through subclassable class.
Sheriff reverting as this CL added four static initializers.
BUG=155557
Review URL: https://chromiumcodereview.appspot.com/11266023
TBR=gman@chromium.org
Review URL: https://codereview.chromium.org/11270035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl/gl_implementation.cc')
| -rw-r--r-- | ui/gl/gl_implementation.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/ui/gl/gl_implementation.cc b/ui/gl/gl_implementation.cc index a97a4df..0a10f22 100644 --- a/ui/gl/gl_implementation.cc +++ b/ui/gl/gl_implementation.cc @@ -10,7 +10,6 @@ #include "base/at_exit.h" #include "base/command_line.h" #include "base/logging.h" -#include "ui/gl/gl_bindings.h" namespace gfx { @@ -63,25 +62,6 @@ bool ExportsCoreFunctionsFromGetProcAddress(GLImplementation implementation) { } -GLApi* g_current_gl_context; -OSMESAApi* g_current_osmesa_context; - -#if defined(OS_WIN) - -EGLApi* g_current_egl_context; -WGLApi* g_current_wgl_context; - -#elif defined(USE_X11) - -EGLApi* g_current_egl_context; -GLXApi* g_current_glx_context; - -#elif defined(OS_ANDROID) - -EGLApi* g_current_egl_context; - -#endif - GLImplementation GetNamedGLImplementation(const std::string& name) { for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kGLImplementationNamePairs); ++i) { if (name == kGLImplementationNamePairs[i].name) |