Bug 1460255 - Use GLContextProviderWayland GL provider on Wayland enabled builds, r=lsalzman
authorMartin Stransky <stransky@redhat.com>
Tue, 15 May 2018 16:16:19 +0200
changeset 420211 229a64156f7001ebd008634bc62694a21c53de07
parent 420210 446eb68ac1c3da3c49d3e14453fb48de03a11ab1
child 420212 b72d77bc8c5693bf439b88c7b6a2447a4b92c4da
push id34068
push usernerli@mozilla.com
push dateTue, 29 May 2018 21:40:19 +0000
treeherdermozilla-central@5852258260e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslsalzman
bugs1460255
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1460255 - Use GLContextProviderWayland GL provider on Wayland enabled builds, r=lsalzman MozReview-Commit-ID: HJsmw4DUH5e
gfx/gl/GLContextProvider.h
--- a/gfx/gl/GLContextProvider.h
+++ b/gfx/gl/GLContextProvider.h
@@ -36,30 +36,38 @@ namespace gl {
 
 #ifdef XP_MACOSX
   #define GL_CONTEXT_PROVIDER_NAME GLContextProviderCGL
   #include "GLContextProviderImpl.h"
   #undef GL_CONTEXT_PROVIDER_NAME
   #define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderCGL
 #endif
 
-#if defined(MOZ_X11) && !defined(MOZ_WAYLAND)
+#if defined(MOZ_X11)
   #define GL_CONTEXT_PROVIDER_NAME GLContextProviderGLX
   #include "GLContextProviderImpl.h"
   #undef GL_CONTEXT_PROVIDER_NAME
   #define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderGLX
 #endif
 
 #define GL_CONTEXT_PROVIDER_NAME GLContextProviderEGL
 #include "GLContextProviderImpl.h"
 #undef GL_CONTEXT_PROVIDER_NAME
 #ifndef GL_CONTEXT_PROVIDER_DEFAULT
   #define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderEGL
 #endif
 
+#if defined(MOZ_WAYLAND)
+  #define GL_CONTEXT_PROVIDER_NAME GLContextProviderWayland
+  #include "GLContextProviderImpl.h"
+  #undef GL_CONTEXT_PROVIDER_NAME
+  #undef GL_CONTEXT_PROVIDER_DEFAULT
+  #define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderWayland
+#endif
+
 #if defined(MOZ_WIDGET_UIKIT)
 #define GL_CONTEXT_PROVIDER_NAME GLContextProviderEAGL
 #include "GLContextProviderImpl.h"
 #undef GL_CONTEXT_PROVIDER_NAME
 #ifndef GL_CONTEXT_PROVIDER_DEFAULT
 #define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderEAGL
 #endif
 #endif