| Index: ui/gl/gl_bindings.h
|
| diff --git a/ui/gl/gl_bindings.h b/ui/gl/gl_bindings.h
|
| index 082d240f3a3f77332791d2e496644ee30a3f4074..8cce4f6b15001197975c643a21f6dd358c3b0dd4 100644
|
| --- a/ui/gl/gl_bindings.h
|
| +++ b/ui/gl/gl_bindings.h
|
| @@ -6,6 +6,7 @@
|
| #define UI_GL_GL_BINDINGS_H_
|
|
|
| #include <string>
|
| +#include <set>
|
|
|
| // Includes the platform independent and platform dependent GL headers.
|
| // Only include this in cc files. It pulls in system headers, including
|
| @@ -345,11 +346,15 @@ struct GL_EXPORT DriverGL {
|
| bool null_draw_bindings_enabled;
|
|
|
| private:
|
| - void InitializeDynamicBindings(GLContext* context);
|
| + void InitializeExtensionBindings(
|
| + GLContext* context,
|
| + const std::set<std::string>& enabled_extensions);
|
| };
|
|
|
| struct GL_EXPORT DriverOSMESA {
|
| void InitializeStaticBindings();
|
| + void InitializeExtensionBindings(
|
| + const std::set<std::string>& enabled_extensions);
|
| void InitializeDebugBindings();
|
| void ClearBindings();
|
|
|
| @@ -357,13 +362,14 @@ struct GL_EXPORT DriverOSMESA {
|
| ProcsOSMESA debug_fn;
|
| ExtensionsOSMESA ext;
|
|
|
| - private:
|
| static std::string GetPlatformExtensions();
|
| };
|
|
|
| #if defined(OS_WIN)
|
| struct GL_EXPORT DriverWGL {
|
| void InitializeStaticBindings();
|
| + void InitializeExtensionBindings(
|
| + const std::set<std::string>& enabled_extensions);
|
| void InitializeDebugBindings();
|
| void ClearBindings();
|
|
|
| @@ -371,7 +377,6 @@ struct GL_EXPORT DriverWGL {
|
| ProcsWGL debug_fn;
|
| ExtensionsWGL ext;
|
|
|
| - private:
|
| static std::string GetPlatformExtensions();
|
| };
|
| #endif
|
| @@ -379,6 +384,8 @@ struct GL_EXPORT DriverWGL {
|
| #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE)
|
| struct GL_EXPORT DriverEGL {
|
| void InitializeStaticBindings();
|
| + void InitializeExtensionBindings(
|
| + const std::set<std::string>& enabled_extensions);
|
| void InitializeDebugBindings();
|
| void ClearBindings();
|
|
|
| @@ -394,6 +401,8 @@ struct GL_EXPORT DriverEGL {
|
| #if defined(USE_X11)
|
| struct GL_EXPORT DriverGLX {
|
| void InitializeStaticBindings();
|
| + void InitializeExtensionBindings(
|
| + const std::set<std::string>& enabled_extensions);
|
| void InitializeDebugBindings();
|
| void ClearBindings();
|
|
|
| @@ -401,7 +410,6 @@ struct GL_EXPORT DriverGLX {
|
| ProcsGLX debug_fn;
|
| ExtensionsGLX ext;
|
|
|
| - private:
|
| static std::string GetPlatformExtensions();
|
| };
|
| #endif
|
|
|