54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
|
|
From: Mart Raudsepp <leio@gentoo.org>
|
|
Date: Sat, 9 May 2020 23:11:52 +0300
|
|
Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix
|
|
some build configurations
|
|
|
|
---
|
|
Source/WebCore/platform/graphics/GLContext.cpp | 5 ++++-
|
|
Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++-
|
|
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
|
|
index b217988b990..1ba0eb8a482 100644
|
|
--- a/Source/WebCore/platform/graphics/GLContext.cpp
|
|
+++ b/Source/WebCore/platform/graphics/GLContext.cpp
|
|
@@ -28,6 +28,9 @@
|
|
|
|
#if USE(GLX)
|
|
#include "GLContextGLX.h"
|
|
+#endif
|
|
+
|
|
+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
|
|
#include "OpenGLShims.h"
|
|
#endif
|
|
|
|
@@ -57,7 +60,7 @@ inline ThreadGlobalGLContext* currentContext()
|
|
|
|
static bool initializeOpenGLShimsIfNeeded()
|
|
{
|
|
-#if USE(OPENGL_ES) || USE(LIBEPOXY)
|
|
+#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE)
|
|
return true;
|
|
#else
|
|
static bool initialized = false;
|
|
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
|
|
index 3515be452b2..82cce70f14b 100644
|
|
--- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
|
|
+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
|
|
@@ -64,7 +64,10 @@
|
|
|
|
#if USE(GLX)
|
|
#include <GL/glx.h>
|
|
-#include <WebCore/OpenGLShims.h>
|
|
+#endif
|
|
+
|
|
+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
|
|
+#include "WebCore/OpenGLShims.h"
|
|
#endif
|
|
|
|
#if USE(GSTREAMER)
|
|
--
|
|
2.20.1
|
|
|