Bug 1608379 [Wayland] Don't use LOCAL_GL_TEXTURE_EXTERNAL on Wayland, r=sotaro
authorMartin Stransky <stransky@redhat.com>
Sat, 11 Jan 2020 17:50:20 +0000
changeset 509866 408f6c0f98146da1f540d5b6759e4d9a787db8ab
parent 509865 13133dc6b4d60c6949c8806032dde7a87514a184
child 509867 b329e8beb91fb010c0e088625cd6b6ef381af06d
push id37005
push usernerli@mozilla.com
push dateSat, 11 Jan 2020 21:51:30 +0000
treeherdermozilla-central@408f6c0f9814 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssotaro
bugs1608379
milestone74.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 1608379 [Wayland] Don't use LOCAL_GL_TEXTURE_EXTERNAL on Wayland, r=sotaro Differential Revision: https://phabricator.services.mozilla.com/D59480
gfx/gl/GLContext.h
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -3429,19 +3429,23 @@ class GLContext : public GenericAtomicRe
 
  public:
   void ForceDirtyScreen();
   void CleanDirtyScreen();
 
   virtual GLenum GetPreferredARGB32Format() const { return LOCAL_GL_RGBA; }
 
   virtual GLenum GetPreferredEGLImageTextureTarget() const {
+#ifdef MOZ_WAYLAND
+    return LOCAL_GL_TEXTURE_2D;
+#else
     return IsExtensionSupported(OES_EGL_image_external)
                ? LOCAL_GL_TEXTURE_EXTERNAL
                : LOCAL_GL_TEXTURE_2D;
+#endif
   }
 
   virtual bool RenewSurface(widget::CompositorWidget* aWidget) { return false; }
 
   // Shared code for GL extensions and GLX extensions.
   static bool ListHasExtension(const GLubyte* extensions,
                                const char* extension);