Title: [276528] trunk/Source/WebCore
- Revision
- 276528
- Author
- [email protected]
- Date
- 2021-04-23 16:21:20 -0700 (Fri, 23 Apr 2021)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (276527 => 276528)
--- trunk/Source/WebCore/ChangeLog 2021-04-23 23:06:12 UTC (rev 276527)
+++ trunk/Source/WebCore/ChangeLog 2021-04-23 23:21:20 UTC (rev 276528)
@@ -1,3 +1,18 @@
+2021-04-23 Don Olmstead <[email protected]>
+
+ 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 <[email protected]>
Not computing image aspect ratios from width and height attributes for lazy loaded images
Modified: trunk/Source/WebCore/platform/graphics/GLContext.cpp (276527 => 276528)
--- trunk/Source/WebCore/platform/graphics/GLContext.cpp 2021-04-23 23:06:12 UTC (rev 276527)
+++ trunk/Source/WebCore/platform/graphics/GLContext.cpp 2021-04-23 23:21:20 UTC (rev 276528)
@@ -57,7 +57,7 @@
static bool initializeOpenGLShimsIfNeeded()
{
-#if USE(OPENGL_ES) || USE(LIBEPOXY)
+#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE)
return true;
#else
static bool initialized = false;
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp (276527 => 276528)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp 2021-04-23 23:06:12 UTC (rev 276527)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp 2021-04-23 23:21:20 UTC (rev 276528)
@@ -34,7 +34,6 @@
#include "GLContext.h"
#include "GraphicsContextGLOpenGLManager.h"
#include "TextureMapperGCGLPlatformLayer.h"
-#include <ANGLE/ShaderLang.h>
#include <wtf/Deque.h>
#include <wtf/NeverDestroyed.h>
@@ -48,11 +47,14 @@
#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
#if USE(NICOSIA)
#if USE(ANGLE)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
