Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1769710 [Linux] Use GLContextProviderLinux on Linux r=jgilbert

Browse Source 
Depends on D146548

Differential Revision: https://phabricator.services.mozilla.com/D146549
This commit is contained in:
stransky 2022-05-18 06:43:48 +00:00
parent d1b8efc7b4
commit 8555fad567
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/gl/GLContextProvider.h
View File

@ -48,22 +48,16 @@ namespace gl {
#include "GLContextProviderImpl.h"
#undef GL_CONTEXT_PROVIDER_NAME
#if defined(MOZ_X11)
# define GL_CONTEXT_PROVIDER_NAME GLContextProviderGLX
# include "GLContextProviderImpl.h"
# undef GL_CONTEXT_PROVIDER_NAME
# define GL_CONTEXT_PROVIDER_NAME GLContextProviderX11
# include "GLContextProviderImpl.h"
# undef GL_CONTEXT_PROVIDER_NAME
# if defined(MOZ_WAYLAND)
# define GL_CONTEXT_PROVIDER_NAME GLContextProviderWayland
#ifdef XP_LINUX
# ifdef MOZ_X11
# define GL_CONTEXT_PROVIDER_NAME GLContextProviderGLX
# include "GLContextProviderImpl.h"
# undef GL_CONTEXT_PROVIDER_NAME
# define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderWayland
# endif
# ifndef GL_CONTEXT_PROVIDER_DEFAULT
# define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderX11
# endif
# define GL_CONTEXT_PROVIDER_NAME GLContextProviderLinux
# include "GLContextProviderImpl.h"
# undef GL_CONTEXT_PROVIDER_NAME
# define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderLinux
#endif
#ifndef GL_CONTEXT_PROVIDER_DEFAULT

12
gfx/gl/moz.build
View File

@ -13,10 +13,7 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit":
gl_provider = "EAGL"
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
if CONFIG["MOZ_X11"]:
gl_provider = "GLX"
else:
gl_provider = "EGL"
gl_provider = "Linux"
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
gl_provider = "EGL"
@ -107,21 +104,18 @@ elif gl_provider == "EAGL":
"GLContextEAGL.h",
]
elif gl_provider == "GLX":
elif gl_provider == "Linux":
# GLContextProviderGLX.cpp needs to be kept out of UNIFIED_SOURCES
# as it includes X11 headers which cause conflicts.
SOURCES += [
"GLContextProviderGLX.cpp",
"GLContextProviderX11.cpp",
"GLContextProviderLinux.cpp",
]
EXPORTS += ["GLContextGLX.h", "GLXLibrary.h"]
if CONFIG["MOZ_WAYLAND"]:
SOURCES += ["SharedSurfaceDMABUF.cpp"]
if CONFIG["MOZ_WAYLAND"] and CONFIG["MOZ_X11"]:
SOURCES += ["GLContextProviderWayland.cpp"]
UNIFIED_SOURCES += [
"AndroidSurfaceTexture.cpp",
"DecomposeIntoNoRepeatTriangles.cpp",