Bug 1460255 - Use GLContextProviderWayland GL provider on Wayland enabled builds, r?lsalzman draft
authorMartin Stransky <stransky@redhat.com>
Tue, 15 May 2018 16:16:19 +0200
changeset 800494 c507ba548fa421e3d29065205f976c9dd8fa9246
parent 800493 4feb589cc10f15f9eb4310175e695d68d1cdd500
push id111379
push userstransky@redhat.com
push dateMon, 28 May 2018 10:44:32 +0000
reviewerslsalzman
bugs1460255
milestone62.0a1
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