Skip to content
Permalink
Browse files
[GTK][WPE] Inclusion of OpenGLShims.h should not depend on USE(GLX)
https://bugs.webkit.org/show_bug.cgi?id=236593

Reviewed by Michael Catanzaro.

Source/WebCore:

No new tests needed.

* platform/graphics/GLContext.cpp: Remove inclusion of OpenGLShims.h guarded by USE(GLX).
* platform/graphics/GLContext.h: Include OpenGLShims.h as fallback option when neither
USE(LIBEPOXY) nor USE(OPENGL_ES) are into effect.

Source/WebKit:

* UIProcess/API/glib/WebKitProtocolHandler.cpp: Move inclusion of GL/glx.h under a
PLATFORM(X11) guard, and inclusion of WebCore/OpenGLShims.h into a chain of guards
which picks it if USE(LIBEPOXY) and USE(OPENGL_ES) are both false, which is the same
checks done in other parts of the code where these are needed.



Canonical link: https://commits.webkit.org/247260@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@289795 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
aperezdc committed Feb 15, 2022
1 parent 6e8b55b commit b65babf43267b620de1c5720a8624e766af525c2
Showing 5 changed files with 34 additions and 6 deletions.
@@ -1,3 +1,16 @@
2022-02-15 Adrian Perez de Castro <aperez@igalia.com>

[GTK][WPE] Inclusion of OpenGLShims.h should not depend on USE(GLX)
https://bugs.webkit.org/show_bug.cgi?id=236593

Reviewed by Michael Catanzaro.

No new tests needed.

* platform/graphics/GLContext.cpp: Remove inclusion of OpenGLShims.h guarded by USE(GLX).
* platform/graphics/GLContext.h: Include OpenGLShims.h as fallback option when neither
USE(LIBEPOXY) nor USE(OPENGL_ES) are into effect.

2022-02-15 Gabriel Nava Marino <gnavamarino@apple.com>

null ptr deref in WebCore::HTMLModelElement::enterFullscreen()
@@ -31,7 +31,6 @@

#if USE(GLX)
#include "GLContextGLX.h"
#include "OpenGLShims.h"
#endif

namespace WebCore {
@@ -28,6 +28,8 @@
#include <epoxy/gl.h>
#elif USE(OPENGL_ES)
#include <GLES2/gl2.h>
#else
#include "OpenGLShims.h"
#endif

#if USE(EGL) && !PLATFORM(GTK)
@@ -1,3 +1,15 @@
2022-02-15 Adrian Perez de Castro <aperez@igalia.com>

[GTK][WPE] Inclusion of OpenGLShims.h should not depend on USE(GLX)
https://bugs.webkit.org/show_bug.cgi?id=236593

Reviewed by Michael Catanzaro.

* UIProcess/API/glib/WebKitProtocolHandler.cpp: Move inclusion of GL/glx.h under a
PLATFORM(X11) guard, and inclusion of WebCore/OpenGLShims.h into a chain of guards
which picks it if USE(LIBEPOXY) and USE(OPENGL_ES) are both false, which is the same
checks done in other parts of the code where these are needed.

2022-02-14 Kimmo Kinnunen <kkinnunen@apple.com>

ExtensionsGL is not useful class, it should be removed
@@ -53,10 +53,17 @@

#if PLATFORM(X11)
#include <WebCore/PlatformDisplayX11.h>
#if USE(GLX)
#include <GL/glx.h>
#endif
#endif

#if USE(LIBEPOXY)
#include <epoxy/gl.h>
#elif USE(OPENGL_ES)
#include <GLES2/gl2.h>
#else
#include <WebCore/OpenGLShims.h>
#endif

#if USE(EGL)
@@ -67,11 +74,6 @@
#endif
#endif

#if USE(GLX)
#include <GL/glx.h>
#include <WebCore/OpenGLShims.h>
#endif

#if USE(GSTREAMER)
#include <gst/gst.h>
#endif

0 comments on commit b65babf

Please sign in to comment.