Changeset 276528 in webkit

Timestamp:

Apr 23, 2021, 4:21:20 PM (5 years ago)

Author:

don.olmstead@sony.com

Message:

Add additional guards around USE_ANGLE
​https://bugs.webkit.org/show_bug.cgi?id=225001

Reviewed by Fujii Hironori.

When USE(ANGLE) initializeOpenGLShims isn't used or available.

When USE(ANGLE) the ANGLE shader compiler isn't needed.

• platform/graphics/GLContext.cpp:

(WebCore::initializeOpenGLShimsIfNeeded):

• platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GLContext.cpp (modified) (1 diff)
• platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-23  Don Olmstead  <don.olmstead@sony.com>
+
+        Add additional guards around USE_ANGLE
+        https://bugs.webkit.org/show_bug.cgi?id=225001
+
+        Reviewed by Fujii Hironori.
+
+        When USE(ANGLE) initializeOpenGLShims isn't used or available.
+
+        When USE(ANGLE) the ANGLE shader compiler isn't needed.
+
+        * platform/graphics/GLContext.cpp:
+        (WebCore::initializeOpenGLShimsIfNeeded):
+        * platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:
+
 2021-04-23  Cathie Chen  <cathiechen@igalia.com>
 

trunk/Source/WebCore/platform/graphics/GLContext.cpp

@@ -58 +58 @@
 static bool initializeOpenGLShimsIfNeeded()
 {
-#if USE(OPENGL_ES) || USE(LIBEPOXY)
+#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE)
     return true;
 #else

trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp

@@ -35 +35 @@
 #include "GraphicsContextGLOpenGLManager.h"
 #include "TextureMapperGCGLPlatformLayer.h"
-#include <ANGLE/ShaderLang.h>
 #include <wtf/Deque.h>
 #include <wtf/NeverDestroyed.h>
@@ -49 +48 @@
 #if USE(ANGLE)
 #include "ExtensionsGLANGLE.h"
-#elif USE(OPENGL_ES)
+#else
+#include <ANGLE/ShaderLang.h>
+#if USE(OPENGL_ES)
 #include "ExtensionsGLOpenGLES.h"
 #else
 #include "ExtensionsGLOpenGL.h"
+#endif
 #endif