<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[285494] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/285494">285494</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-11-09 06:31:38 -0800 (Tue, 09 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/285436">r285436</a>.
https://bugs.webkit.org/show_bug.cgi?id=232878

Broke WPE build

Reverted changeset:

"[WebXR] three.js demos don't work"
https://bugs.webkit.org/show_bug.cgi?id=232798
https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/285436">r285436</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebxrWebXROpaqueFramebuffercpp">trunk/Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (285493 => 285494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-11-09 13:53:12 UTC (rev 285493)
+++ trunk/Source/WebCore/ChangeLog      2021-11-09 14:31:38 UTC (rev 285494)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2021-11-09  Commit Queue  <commit-queue@webkit.org>
</span><span class="cx"> 
</span><ins>+        Unreviewed, reverting r285436.
+        https://bugs.webkit.org/show_bug.cgi?id=232878
+
+        Broke WPE build
+
+        Reverted changeset:
+
+        "[WebXR] three.js demos don't work"
+        https://bugs.webkit.org/show_bug.cgi?id=232798
+        https://commits.webkit.org/r285436
+
+2021-11-09  Commit Queue  <commit-queue@webkit.org>
+
</ins><span class="cx">         Unreviewed, reverting r285486.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=232876
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebxrWebXROpaqueFramebuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp (285493 => 285494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp    2021-11-09 13:53:12 UTC (rev 285493)
+++ trunk/Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp       2021-11-09 14:31:38 UTC (rev 285494)
</span><span class="lines">@@ -102,20 +102,14 @@
</span><span class="cx">     if (!m_context.graphicsContextGL())
</span><span class="cx">         return;
</span><span class="cx">     auto& gl = *m_context.graphicsContextGL();
</span><del>-    auto gCGL = static_cast<GraphicsContextGLOpenGL*>(m_context.graphicsContextGL());
-    GCGLenum textureTarget = gCGL->drawingBufferTextureTarget();
-    GCGLenum textureTargetBinding = gCGL->drawingBufferTextureTargetQueryForDrawingTarget(textureTarget);
</del><span class="cx"> 
</span><span class="cx">     m_framebuffer->setOpaqueActive(true);
</span><span class="cx"> 
</span><span class="cx">     GCGLint boundFBO { 0 };
</span><del>-    GCGLint boundTexture { 0 };
</del><ins>+
</ins><span class="cx">     gl.getIntegerv(GL::FRAMEBUFFER_BINDING, makeGCGLSpan(&boundFBO, 1));
</span><del>-    gl.getIntegerv(textureTargetBinding, makeGCGLSpan(&boundTexture, 1));
-
-    auto scopedBindings = makeScopeExit([&gl, boundFBO, boundTexture, textureTarget]() {
</del><ins>+    auto scopedFBOs = makeScopeExit([&gl, boundFBO]() {
</ins><span class="cx">         gl.bindFramebuffer(GL::FRAMEBUFFER, boundFBO);
</span><del>-        gl.bindTexture(textureTarget, boundTexture);
</del><span class="cx">     });
</span><span class="cx"> 
</span><span class="cx">     gl.bindFramebuffer(GraphicsContextGL::FRAMEBUFFER, m_framebuffer->object());
</span><span class="lines">@@ -128,6 +122,9 @@
</span><span class="cx"> #if USE(IOSURFACE_FOR_XR_LAYER_DATA)
</span><span class="cx">     ASSERT(data.surface);
</span><span class="cx"> 
</span><ins>+    auto gCGL = static_cast<GraphicsContextGLOpenGL*>(m_context.graphicsContextGL());
+    GCGLenum textureTarget = gCGL->drawingBufferTextureTarget();
+
</ins><span class="cx">     if (!m_opaqueTexture)
</span><span class="cx">         m_opaqueTexture = gCGL->createTexture();
</span><span class="cx"> 
</span><span class="lines">@@ -159,12 +156,11 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    // Set up the framebuffer to use the texture that points to the IOSurface. If we're not multisampling,
-    // the target framebuffer is m_framebuffer->object() (bound above). If we are multisampling, the target
-    // is the resolved framebuffer we created in setupFramebuffer.
-    if (m_multisampleColorBuffer)
-        gl.bindFramebuffer(GL::FRAMEBUFFER, m_resolvedFBO);
-    gl.framebufferTexture2D(GL::FRAMEBUFFER, GL::COLOR_ATTACHMENT0, textureTarget, m_opaqueTexture, 0);
</del><ins>+    // If we're not multisampling, set up the framebuffer to use the texture that points to the IOSurface. The depth and
+    // stencil buffers were attached by setupFramebuffer. If we are multisampling, the framebuffer was initialized in setupFramebuffer,
+    // and we'll resolve into the m_opaqueTexture in endFrame.
+    if (!m_multisampleColorBuffer)
+        gl.framebufferTexture2D(GL::FRAMEBUFFER, GL::COLOR_ATTACHMENT0, GL::TEXTURE_2D, m_opaqueTexture, 0);
</ins><span class="cx"> 
</span><span class="cx">     // At this point the framebuffer should be "complete".
</span><span class="cx">     ASSERT(gl.checkFramebufferStatus(GL::FRAMEBUFFER) == GL::FRAMEBUFFER_COMPLETE);
</span><span class="lines">@@ -203,21 +199,20 @@
</span><span class="cx">         TemporaryOpenGLSetting scopedStencil(GL::STENCIL_TEST, 0);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-        GCGLint boundFBO { 0 };
</del><span class="cx">         GCGLint boundReadFBO { 0 };
</span><span class="cx">         GCGLint boundDrawFBO { 0 };
</span><del>-        gl.getIntegerv(GL::FRAMEBUFFER_BINDING, makeGCGLSpan(&boundFBO, 1));
</del><span class="cx">         gl.getIntegerv(GL::READ_FRAMEBUFFER_BINDING, makeGCGLSpan(&boundReadFBO, 1));
</span><span class="cx">         gl.getIntegerv(GL::DRAW_FRAMEBUFFER_BINDING, makeGCGLSpan(&boundDrawFBO, 1));
</span><span class="cx"> 
</span><del>-        auto scopedBindings = makeScopeExit([&gl, boundFBO, boundReadFBO, boundDrawFBO]() {
-            gl.bindFramebuffer(GL::FRAMEBUFFER, boundFBO);
</del><ins>+        auto scopedFBOs = makeScopeExit([&gl, boundReadFBO, boundDrawFBO]() {
</ins><span class="cx">             gl.bindFramebuffer(GL::READ_FRAMEBUFFER, boundReadFBO);
</span><span class="cx">             gl.bindFramebuffer(GL::DRAW_FRAMEBUFFER, boundDrawFBO);
</span><span class="cx">         });
</span><span class="cx"> 
</span><ins>+        gl.bindFramebuffer(GL::DRAW_FRAMEBUFFER, m_resolvedFBO);
+        gl.framebufferTexture2D(GL::FRAMEBUFFER, GL::COLOR_ATTACHMENT0, GL::TEXTURE_2D, m_opaqueTexture, 0);
+
</ins><span class="cx">         gl.bindFramebuffer(GL::READ_FRAMEBUFFER, m_framebuffer->object());
</span><del>-        gl.bindFramebuffer(GL::DRAW_FRAMEBUFFER, m_resolvedFBO);
</del><span class="cx">         gl.blitFramebuffer(0, 0, m_width, m_height, 0, 0, m_width, m_height, GL::COLOR_BUFFER_BIT, GL::NEAREST);
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -250,13 +245,12 @@
</span><span class="cx">         return false;
</span><span class="cx">     auto& gl = *m_context.graphicsContextGL();
</span><span class="cx"> 
</span><del>-    // Restore bindings when exiting the function.
</del><ins>+    // Bind current FBOs when exiting the function
</ins><span class="cx">     GCGLint boundFBO { 0 };
</span><span class="cx">     GCGLint boundRenderbuffer { 0 };
</span><span class="cx">     gl.getIntegerv(GL::FRAMEBUFFER_BINDING, makeGCGLSpan(&boundFBO, 1));
</span><span class="cx">     gl.getIntegerv(GL::RENDERBUFFER_BINDING, makeGCGLSpan(&boundRenderbuffer, 1));
</span><del>-
-    auto scopedBindings = makeScopeExit([&gl, boundFBO, boundRenderbuffer]() {
</del><ins>+    auto scopedFBO = makeScopeExit([&gl, boundFBO, boundRenderbuffer]() {
</ins><span class="cx">         gl.bindFramebuffer(GL::FRAMEBUFFER, boundFBO);
</span><span class="cx">         gl.bindRenderbuffer(GL::RENDERBUFFER, boundRenderbuffer);
</span><span class="cx">     });
</span><span class="lines">@@ -263,6 +257,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Set up color, depth and stencil formats
</span><span class="cx">     bool hasDepthOrStencil = m_attributes.stencil || m_attributes.depth;
</span><ins>+    auto colorFormat = m_attributes.alpha ? GL::RGBA8 : GL::RGB8;
</ins><span class="cx"> #if USE(OPENGL_ES)
</span><span class="cx">     auto& extensions = reinterpret_cast<ExtensionsGLOpenGLES&>(gl.getExtensions());
</span><span class="cx">     bool platformSupportsPackedDepthStencil = hasDepthOrStencil && extensions.supports("GL_OES_packed_depth_stencil");
</span><span class="lines">@@ -330,7 +325,7 @@
</span><span class="cx">         m_multisampleColorBuffer = gl.createRenderbuffer();
</span><span class="cx">         gl.bindFramebuffer(GL::FRAMEBUFFER, m_framebuffer->object());
</span><span class="cx">         gl.bindRenderbuffer(GL::RENDERBUFFER, m_multisampleColorBuffer);
</span><del>-        gl.renderbufferStorageMultisample(GL::RENDERBUFFER, m_sampleCount, GL::RGBA8, m_width, m_height);
</del><ins>+        gl.renderbufferStorageMultisample(GL::RENDERBUFFER, m_sampleCount, colorFormat, m_width, m_height);
</ins><span class="cx">         gl.framebufferRenderbuffer(GL::FRAMEBUFFER, GL::COLOR_ATTACHMENT0, GL::RENDERBUFFER, m_multisampleColorBuffer);
</span><span class="cx">         if (hasDepthOrStencil) {
</span><span class="cx">             m_depthStencilBuffer = gl.createRenderbuffer();
</span></span></pre>
</div>
</div>

</body>
</html>