<!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>[215033] releases/WebKitGTK/webkit-2.14/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/215033">215033</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-06 05:53:53 -0700 (Thu, 06 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/214162">r214162</a> - [Cairo] Ensure depth and stencil renderbuffers are created on GLESv2
https://bugs.webkit.org/show_bug.cgi?id=166643
Patch by Emanuele Aina <emanuele.aina@collabora.com> on 2017-03-20
Reviewed by Darin Adler.
If the gfx device doesn't support GL_OES_packed_depth_stencil, the
separate depth and stencil buffers are not generated.
Copy what GraphicsContext3DEfl used to do and apply it in
GraphicsContext3DCairo.
The Intel gfx driver seem to tolerate unbound renderbuffers, but
enabling debugging in Mesa yields an error:
$ MESA_DEBUG=1 \
MESA_EXTENSION_OVERRIDE=-GL_OES_packed_depth_stencil
./bin/MiniBrowser http://webglsamples.org/aquarium/aquarium.html
Mesa: User error: GL_INVALID_OPERATION in glRenderbufferStorage(no renderbuffer bound)
* platform/graphics/GraphicsContext3D.h:
* platform/graphics/cairo/GraphicsContext3DCairo.cpp:
(WebCore::GraphicsContext3D::GraphicsContext3D):
Ensure separate depth and stencil renderbuffers are created.
(WebCore::GraphicsContext3D::~GraphicsContext3D):
Ensure separate depth and stencil renderbuffers are released.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsGraphicsContext3Dh">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/GraphicsContext3D.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicscairoGraphicsContext3DCairocpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (215032 => 215033)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-04-06 12:51:36 UTC (rev 215032)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-04-06 12:53:53 UTC (rev 215033)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2017-03-20 Emanuele Aina <emanuele.aina@collabora.com>
+
+ [Cairo] Ensure depth and stencil renderbuffers are created on GLESv2
+ https://bugs.webkit.org/show_bug.cgi?id=166643
+
+ Reviewed by Darin Adler.
+
+ If the gfx device doesn't support GL_OES_packed_depth_stencil, the
+ separate depth and stencil buffers are not generated.
+
+ Copy what GraphicsContext3DEfl used to do and apply it in
+ GraphicsContext3DCairo.
+
+ The Intel gfx driver seem to tolerate unbound renderbuffers, but
+ enabling debugging in Mesa yields an error:
+
+ $ MESA_DEBUG=1 \
+ MESA_EXTENSION_OVERRIDE=-GL_OES_packed_depth_stencil
+ ./bin/MiniBrowser http://webglsamples.org/aquarium/aquarium.html
+ Mesa: User error: GL_INVALID_OPERATION in glRenderbufferStorage(no renderbuffer bound)
+
+ * platform/graphics/GraphicsContext3D.h:
+ * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+ (WebCore::GraphicsContext3D::GraphicsContext3D):
+ Ensure separate depth and stencil renderbuffers are created.
+ (WebCore::GraphicsContext3D::~GraphicsContext3D):
+ Ensure separate depth and stencil renderbuffers are released.
+
</ins><span class="cx"> 2017-03-17 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Cairo] Handle the blend mode in GraphicsContext::drawPattern
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsGraphicsContext3Dh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/GraphicsContext3D.h (215032 => 215033)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/GraphicsContext3D.h 2017-04-06 12:51:36 UTC (rev 215032)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/GraphicsContext3D.h 2017-04-06 12:53:53 UTC (rev 215033)
</span><span class="lines">@@ -1380,9 +1380,9 @@
</span><span class="cx"> GC3Duint m_intermediateTexture;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- GC3Duint m_depthBuffer;
- GC3Duint m_stencilBuffer;
- GC3Duint m_depthStencilBuffer;
</del><ins>+ GC3Duint m_depthBuffer { 0 };
+ GC3Duint m_stencilBuffer { 0 };
+ GC3Duint m_depthStencilBuffer { 0 };
</ins><span class="cx">
</span><span class="cx"> bool m_layerComposited;
</span><span class="cx"> GC3Duint m_internalColorFormat;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicscairoGraphicsContext3DCairocpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp (215032 => 215033)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2017-04-06 12:51:36 UTC (rev 215032)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2017-04-06 12:53:53 UTC (rev 215033)
</span><span class="lines">@@ -86,7 +86,6 @@
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> , m_intermediateTexture(0)
</span><span class="cx"> #endif
</span><del>- , m_depthStencilBuffer(0)
</del><span class="cx"> , m_layerComposited(false)
</span><span class="cx"> , m_multisampleFBO(0)
</span><span class="cx"> , m_multisampleDepthStencilBuffer(0)
</span><span class="lines">@@ -129,9 +128,6 @@
</span><span class="cx"> ::glBindTexture(GL_TEXTURE_2D, 0);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_state.boundFBO = m_fbo;
- if (!m_attrs.antialias && (m_attrs.stencil || m_attrs.depth))
- ::glGenRenderbuffers(1, &m_depthStencilBuffer);
</del><span class="cx">
</span><span class="cx"> // Create a multisample FBO.
</span><span class="cx"> if (m_attrs.antialias) {
</span><span class="lines">@@ -141,6 +137,18 @@
</span><span class="cx"> ::glGenRenderbuffers(1, &m_multisampleColorBuffer);
</span><span class="cx"> if (m_attrs.stencil || m_attrs.depth)
</span><span class="cx"> ::glGenRenderbuffers(1, &m_multisampleDepthStencilBuffer);
</span><ins>+ } else {
+ // Bind canvas FBO.
+ glBindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_fbo);
+ m_state.boundFBO = m_fbo;
+#if USE(OPENGL_ES_2)
+ if (m_attrs.depth)
+ glGenRenderbuffers(1, &m_depthBuffer);
+ if (m_attrs.stencil)
+ glGenRenderbuffers(1, &m_stencilBuffer);
+#endif
+ if (m_attrs.stencil || m_attrs.depth)
+ glGenRenderbuffers(1, &m_depthStencilBuffer);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -214,8 +222,15 @@
</span><span class="cx"> if (m_attrs.stencil || m_attrs.depth)
</span><span class="cx"> ::glDeleteRenderbuffers(1, &m_multisampleDepthStencilBuffer);
</span><span class="cx"> ::glDeleteFramebuffers(1, &m_multisampleFBO);
</span><del>- } else {
- if (m_attrs.stencil || m_attrs.depth)
</del><ins>+ } else if (m_attrs.stencil || m_attrs.depth) {
+#if USE(OPENGL_ES_2)
+ if (m_depthBuffer)
+ glDeleteRenderbuffers(1, &m_depthBuffer);
+
+ if (m_stencilBuffer)
+ glDeleteRenderbuffers(1, &m_stencilBuffer);
+#endif
+ if (m_depthStencilBuffer)
</ins><span class="cx"> ::glDeleteRenderbuffers(1, &m_depthStencilBuffer);
</span><span class="cx"> }
</span><span class="cx"> ::glDeleteFramebuffers(1, &m_fbo);
</span></span></pre>
</div>
</div>
</body>
</html>