<!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>[211780] 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/211780">211780</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-07 01:31:53 -0800 (Tue, 07 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210847">r210847</a> - [GTK] [TextureMapper] [GLES2] Draw repeated patterns for NPOT textures manually
https://bugs.webkit.org/show_bug.cgi?id=167118
Reviewed by Žan Doberšek.
When using GLES2 without the GL_OES_texture_npot extension, some implementations fail to properly
draw repeated patters from a texture (using GL_REPEAT). For those cases, perform the repetition
manually using the shader.
Covered by existent tests.
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::driverSupportsNPOTTextures):
(WebCore::TextureMapperGL::drawTexture):
(WebCore::TextureMapperGL::drawTexturedQuadWithProgram):
* platform/graphics/texmap/TextureMapperShaderProgram.cpp:
(WebCore::TextureMapperShaderProgram::create):
* platform/graphics/texmap/TextureMapperShaderProgram.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicstexmapTextureMapperGLcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramh">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h</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 (211779 => 211780)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-07 09:00:10 UTC (rev 211779)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-07 09:31:53 UTC (rev 211780)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-01-18 Miguel Gomez <magomez@igalia.com>
+
+ [GTK] [TextureMapper] [GLES2] Draw repeated patterns for NPOT textures manually
+ https://bugs.webkit.org/show_bug.cgi?id=167118
+
+ Reviewed by Žan Doberšek.
+
+ When using GLES2 without the GL_OES_texture_npot extension, some implementations fail to properly
+ draw repeated patters from a texture (using GL_REPEAT). For those cases, perform the repetition
+ manually using the shader.
+
+ Covered by existent tests.
+
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::driverSupportsNPOTTextures):
+ (WebCore::TextureMapperGL::drawTexture):
+ (WebCore::TextureMapperGL::drawTexturedQuadWithProgram):
+ * platform/graphics/texmap/TextureMapperShaderProgram.cpp:
+ (WebCore::TextureMapperShaderProgram::create):
+ * platform/graphics/texmap/TextureMapperShaderProgram.h:
+
</ins><span class="cx"> 2017-01-10 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CoordinatedGraphics] TextureMapperPlatformLayerProxy is constantly getting activated
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicstexmapTextureMapperGLcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (211779 => 211780)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2017-02-07 09:00:10 UTC (rev 211779)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2017-02-07 09:31:53 UTC (rev 211780)
</span><span class="lines">@@ -417,6 +417,16 @@
</span><span class="cx"> drawTexture(textureGL.id(), textureGL.isOpaque() ? 0 : ShouldBlend, textureGL.size(), targetRect, matrix, opacity, exposedEdges);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool driverSupportsNPOTTextures(GraphicsContext3D& context)
+{
+ if (context.isGLES2Compliant()) {
+ static bool supportsNPOTTextures = context.getExtensions()->supports("GL_OES_texture_npot");
+ return supportsNPOTTextures;
+ }
+
+ return true;
+}
+
</ins><span class="cx"> void TextureMapperGL::drawTexture(Platform3DObject texture, Flags flags, const IntSize& textureSize, const FloatRect& targetRect, const TransformationMatrix& modelViewMatrix, float opacity, unsigned exposedEdges)
</span><span class="cx"> {
</span><span class="cx"> bool useRect = flags & ShouldUseARBTextureRect;
</span><span class="lines">@@ -433,6 +443,8 @@
</span><span class="cx"> options |= TextureMapperShaderProgram::Antialiasing;
</span><span class="cx"> flags |= ShouldAntialias;
</span><span class="cx"> }
</span><ins>+ if (wrapMode() == RepeatWrap && !driverSupportsNPOTTextures(*m_context3D))
+ options |= TextureMapperShaderProgram::ManualRepeat;
</ins><span class="cx">
</span><span class="cx"> RefPtr<FilterOperation> filter = data().filterInfo ? data().filterInfo->filter: 0;
</span><span class="cx"> GC3Duint filterContentTextureID = 0;
</span><span class="lines">@@ -554,7 +566,7 @@
</span><span class="cx"> GC3Denum target = flags & ShouldUseARBTextureRect ? GC3Denum(Extensions3D::TEXTURE_RECTANGLE_ARB) : GC3Denum(GraphicsContext3D::TEXTURE_2D);
</span><span class="cx"> m_context3D->bindTexture(target, texture);
</span><span class="cx"> m_context3D->uniform1i(program.samplerLocation(), 0);
</span><del>- if (wrapMode() == RepeatWrap) {
</del><ins>+ if (wrapMode() == RepeatWrap && driverSupportsNPOTTextures(*m_context3D)) {
</ins><span class="cx"> m_context3D->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::REPEAT);
</span><span class="cx"> m_context3D->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::REPEAT);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp (211779 => 211780)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp 2017-02-07 09:00:10 UTC (rev 211779)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp 2017-02-07 09:31:53 UTC (rev 211780)
</span><span class="lines">@@ -159,6 +159,7 @@
</span><span class="cx">
</span><span class="cx"> void noop(inout vec4 dummyParameter) { }
</span><span class="cx"> void noop(inout vec4 dummyParameter, vec2 texCoord) { }
</span><ins>+ void noop(inout vec2 dummyParameter) { }
</ins><span class="cx">
</span><span class="cx"> float antialias() { return smoothstep(0., 1., v_antialias); }
</span><span class="cx">
</span><span class="lines">@@ -170,6 +171,8 @@
</span><span class="cx">
</span><span class="cx"> vec2 vertexTransformTexCoord() { return v_transformedTexCoord; }
</span><span class="cx">
</span><ins>+ void applyManualRepeat(inout vec2 pos) { pos = fract(pos); }
+
</ins><span class="cx"> void applyTexture(inout vec4 color, vec2 texCoord) { color = SamplerFunction(s_sampler, texCoord); }
</span><span class="cx"> void applyOpacity(inout vec4 color) { color *= u_opacity; }
</span><span class="cx"> void applyAntialiasing(inout vec4 color) { color *= antialias(); }
</span><span class="lines">@@ -281,6 +284,7 @@
</span><span class="cx"> {
</span><span class="cx"> vec4 color = vec4(1., 1., 1., 1.);
</span><span class="cx"> vec2 texCoord = transformTexCoord();
</span><ins>+ applyManualRepeatIfNeeded(texCoord);
</ins><span class="cx"> applyTextureIfNeeded(color, texCoord);
</span><span class="cx"> applySolidColorIfNeeded(color);
</span><span class="cx"> applyAntialiasingIfNeeded(color);
</span><span class="lines">@@ -323,6 +327,7 @@
</span><span class="cx"> SET_APPLIER_FROM_OPTIONS(BlurFilter);
</span><span class="cx"> SET_APPLIER_FROM_OPTIONS(AlphaBlur);
</span><span class="cx"> SET_APPLIER_FROM_OPTIONS(ContentTexture);
</span><ins>+ SET_APPLIER_FROM_OPTIONS(ManualRepeat);
</ins><span class="cx">
</span><span class="cx"> StringBuilder vertexShaderBuilder;
</span><span class="cx"> vertexShaderBuilder.append(optionsApplierBuilder.toString());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h (211779 => 211780)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h 2017-02-07 09:00:10 UTC (rev 211779)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h 2017-02-07 09:31:53 UTC (rev 211780)
</span><span class="lines">@@ -60,7 +60,8 @@
</span><span class="cx"> OpacityFilter = 1L << 13,
</span><span class="cx"> BlurFilter = 1L << 14,
</span><span class="cx"> AlphaBlur = 1L << 15,
</span><del>- ContentTexture = 1L << 16
</del><ins>+ ContentTexture = 1L << 16,
+ ManualRepeat = 1L << 17
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef unsigned Options;
</span></span></pre>
</div>
</div>
</body>
</html>