Title: [292092] branches/safari-613-branch
- Revision
- 292092
- Author
- alanc...@apple.com
- Date
- 2022-03-29 18:36:03 -0700 (Tue, 29 Mar 2022)
Log Message
Apply patch. rdar://problem/89997669
Modified Paths
Diff
Modified: branches/safari-613-branch/ChangeLog (292091 => 292092)
--- branches/safari-613-branch/ChangeLog 2022-03-30 01:35:59 UTC (rev 292091)
+++ branches/safari-613-branch/ChangeLog 2022-03-30 01:36:03 UTC (rev 292092)
@@ -1,3 +1,18 @@
+2022-03-29 Alan Coon <alanc...@apple.com>
+
+ Apply patch. rdar://problem/89997669
+
+ 2022-01-12 Chris Lord <cl...@igalia.com>
+
+ [WPE] Fix building WebXR with ANGLE enabled
+ https://bugs.webkit.org/show_bug.cgi?id=235108
+
+ Reviewed by Alejandro G. Castro.
+
+ Remove conflict between WebXR and ANGLE WebGL for WPE.
+
+ * Source/cmake/OptionsWPE.cmake:
+
2022-03-07 Russell Epstein <repst...@apple.com>
Cherry-pick r289101. rdar://problem/87625596
Modified: branches/safari-613-branch/Source/WebCore/ChangeLog (292091 => 292092)
--- branches/safari-613-branch/Source/WebCore/ChangeLog 2022-03-30 01:35:59 UTC (rev 292091)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog 2022-03-30 01:36:03 UTC (rev 292092)
@@ -1,3 +1,21 @@
+2022-03-29 Alan Coon <alanc...@apple.com>
+
+ Apply patch. rdar://problem/89997669
+
+ 2022-01-12 Chris Lord <cl...@igalia.com>
+
+ [WPE] Fix building WebXR with ANGLE enabled
+ https://bugs.webkit.org/show_bug.cgi?id=235108
+
+ Reviewed by Alejandro G. Castro.
+
+ Fix building both ANGLE WebGL and WebXR simultaneously when GLES is
+ being used.
+
+ * Modules/webxr/WebXROpaqueFramebuffer.cpp:
+ (WebCore::WebXROpaqueFramebuffer::startFrame):
+ (WebCore::WebXROpaqueFramebuffer::setupFramebuffer):
+
2022-03-29 Russell Epstein <repst...@apple.com>
Cherry-pick r291494. rdar://problem/90957324
Modified: branches/safari-613-branch/Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp (292091 => 292092)
--- branches/safari-613-branch/Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp 2022-03-30 01:35:59 UTC (rev 292091)
+++ branches/safari-613-branch/Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp 2022-03-30 01:36:03 UTC (rev 292092)
@@ -31,11 +31,9 @@
#if !USE(ANGLE)
#include "ExtensionsGLOpenGLCommon.h"
-#endif
#if USE(OPENGL_ES)
#include "ExtensionsGLOpenGLES.h"
#endif
-#if !USE(ANGLE)
#include "GraphicsContextGL.h"
#endif
#include "IntSize.h"
@@ -178,7 +176,7 @@
#else
m_opaqueTexture = data.opaqueTexture;
-#if USE(OPENGL_ES)
+#if USE(OPENGL_ES) && !USE(ANGLE)
auto& extensions = reinterpret_cast<ExtensionsGLOpenGLES&>(gl.getExtensions());
if (m_attributes.antialias && extensions.isImagination()) {
extensions.framebufferTexture2DMultisampleIMG(GL::FRAMEBUFFER, GL::COLOR_ATTACHMENT0, GL::TEXTURE_2D, m_opaqueTexture, 0, m_sampleCount);
@@ -269,15 +267,15 @@
// Set up color, depth and stencil formats
bool hasDepthOrStencil = m_attributes.stencil || m_attributes.depth;
-#if USE(OPENGL_ES)
+#if USE(ANGLE)
+ bool platformSupportsPackedDepthStencil = true;
+ auto depthFormat = platformSupportsPackedDepthStencil ? GL::DEPTH24_STENCIL8 : GL::DEPTH_COMPONENT;
+ auto stencilFormat = GL::STENCIL_INDEX8;
+#elif USE(OPENGL_ES)
auto& extensions = reinterpret_cast<ExtensionsGLOpenGLES&>(gl.getExtensions());
bool platformSupportsPackedDepthStencil = hasDepthOrStencil && extensions.supports("GL_OES_packed_depth_stencil");
auto depthFormat = platformSupportsPackedDepthStencil ? GL::DEPTH24_STENCIL8 : GL::DEPTH_COMPONENT16;
auto stencilFormat = GL::STENCIL_INDEX8;
-#elif USE(ANGLE)
- bool platformSupportsPackedDepthStencil = true;
- auto depthFormat = platformSupportsPackedDepthStencil ? GL::DEPTH24_STENCIL8 : GL::DEPTH_COMPONENT;
- auto stencilFormat = GL::STENCIL_INDEX8;
#else
auto& extensions = reinterpret_cast<ExtensionsGLOpenGLCommon&>(gl.getExtensions());
bool platformSupportsPackedDepthStencil = hasDepthOrStencil && extensions.supports("GL_EXT_packed_depth_stencil");
@@ -298,7 +296,7 @@
m_sampleCount = std::min(4, maxSampleCount);
}
-#if USE(OPENGL_ES)
+#if USE(OPENGL_ES) && !USE(ANGLE)
// Use multisampled_render_to_texture extension if available.
if (m_attributes.antialias && extensions.isImagination()) {
// framebufferTexture2DMultisampleIMG is set up in startFrame call.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
