Commit 3c4b7ef1 authored by msb@chromium.org's avatar msb@chromium.org

wayland: Fix GL extension binding init to work again for use_wayland

BUG=102903
TEST=compile

Change-Id: I39b360c5f982e83a1fad3f68f65cc3e88c31cf2a

R=backer@chromium.org,dnicoara@chromium.org,joth@chromium.org,alokp@chromium.org


Review URL: http://codereview.chromium.org/8601005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111013 0039d316-1c4b-4281-b951-d872f2087c98
parent 24d4592c
...@@ -57,9 +57,11 @@ base::LazyInstance<base::Lock, ...@@ -57,9 +57,11 @@ base::LazyInstance<base::Lock,
} // namespace anonymous } // namespace anonymous
void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) { void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) {
#if !defined(USE_WAYLAND)
impls->push_back(kGLImplementationOSMesaGL);
impls->push_back(kGLImplementationDesktopGL); impls->push_back(kGLImplementationDesktopGL);
#endif
impls->push_back(kGLImplementationEGLGLES2); impls->push_back(kGLImplementationEGLGLES2);
impls->push_back(kGLImplementationOSMesaGL);
} }
bool InitializeGLBindings(GLImplementation implementation) { bool InitializeGLBindings(GLImplementation implementation) {
...@@ -190,6 +192,7 @@ bool InitializeGLBindings(GLImplementation implementation) { ...@@ -190,6 +192,7 @@ bool InitializeGLBindings(GLImplementation implementation) {
bool InitializeGLExtensionBindings(GLImplementation implementation, bool InitializeGLExtensionBindings(GLImplementation implementation,
GLContext* context) { GLContext* context) {
switch (implementation) { switch (implementation) {
#if !defined(USE_WAYLAND)
case kGLImplementationOSMesaGL: case kGLImplementationOSMesaGL:
InitializeGLExtensionBindingsGL(context); InitializeGLExtensionBindingsGL(context);
InitializeGLExtensionBindingsOSMESA(context); InitializeGLExtensionBindingsOSMESA(context);
...@@ -198,6 +201,7 @@ bool InitializeGLExtensionBindings(GLImplementation implementation, ...@@ -198,6 +201,7 @@ bool InitializeGLExtensionBindings(GLImplementation implementation,
InitializeGLExtensionBindingsGL(context); InitializeGLExtensionBindingsGL(context);
InitializeGLExtensionBindingsGLX(context); InitializeGLExtensionBindingsGLX(context);
break; break;
#endif
case kGLImplementationEGLGLES2: case kGLImplementationEGLGLES2:
InitializeGLExtensionBindingsGL(context); InitializeGLExtensionBindingsGL(context);
InitializeGLExtensionBindingsEGL(context); InitializeGLExtensionBindingsEGL(context);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment