<!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>[161684] trunk</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/161684">161684</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 15:28:29 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore: [WebGL] Correct uniform input validation for texture sampler uniform
https://bugs.webkit.org/show_bug.cgi?id=126775
Reviewed by Dean Jackson.
Added fast/canvas/webgl/uniform-samplers-test.html
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::uniform1iv): Access Int32Array data properly.
LayoutTests: [WebGL] Correct uniform input validation for texture sampler uniforms.
https://bugs.webkit.org/show_bug.cgi?id=126775
Reviewed by Dean Jackson.
* fast/canvas/webgl/uniform-samplers-test.html: Add a test that
shows that we can set sampler uniforms using Int32Array types.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvaswebgluniformsamplerstesthtml">trunk/LayoutTests/fast/canvas/webgl/uniform-samplers-test.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161683 => 161684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-10 23:17:57 UTC (rev 161683)
+++ trunk/LayoutTests/ChangeLog 2014-01-10 23:28:29 UTC (rev 161684)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-10 Brent Fulgham <bfulgham@apple.com>
+
+ [WebGL] Correct uniform input validation for texture sampler uniforms.
+ https://bugs.webkit.org/show_bug.cgi?id=126775
+
+ Reviewed by Dean Jackson.
+
+ * fast/canvas/webgl/uniform-samplers-test.html: Add a test that
+ shows that we can set sampler uniforms using Int32Array types.
+
</ins><span class="cx"> 2014-01-10 Dirk Schulze <krit@webkit.org>
</span><span class="cx">
</span><span class="cx"> Make clipping path from basic-shapes relative to <box> value
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebgluniformsamplerstesthtmlfromrev161670trunkLayoutTestswebgl102resourceswebgl_test_filesconformanceuniformsuniformsamplerstesthtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/canvas/webgl/uniform-samplers-test.html (from rev 161670, trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/conformance/uniforms/uniform-samplers-test.html) (0 => 161684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/uniform-samplers-test.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/uniform-samplers-test.html 2014-01-10 23:28:29 UTC (rev 161684)
</span><span class="lines">@@ -0,0 +1,114 @@
</span><ins>+<!--
+
+/*
+** Copyright (c) 2012 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+-->
+
+<!DOCTYPE html>
+<html>
+ <head>
+<meta charset="utf-8">
+ <title>WebGL sampler uniforms conformance test.</title>
+ <link rel="stylesheet" href="../../resources/js-test-style.css"/>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script src="../resources/webgl-test.js"> </script>
+ <script src="../resources/webgl-test-utils.js"></script>
+</head>
+<body>
+<canvas id="example" width="2" height="2" style="width: 40px; height: 40px;"></canvas>
+<div id="description"></div>
+<div id="console"></div>
+
+ <script>
+"use strict";
+function init()
+{
+ description(
+ "Tests that only Uniform1i and Uniform1iv can be used to set" +
+ "sampler uniforms.");
+
+ var canvas2d = document.getElementById("canvas2d");
+
+ var wtu = WebGLTestUtils;
+ var gl = wtu.create3DContext("example");
+ var program = wtu.setupTexturedQuad(gl);
+
+ var textureLoc = gl.getUniformLocation(program, "tex");
+ var testInt32Array = new Int32Array(4);
+
+ gl.uniform1i(textureLoc, 1);
+ glErrorShouldBe(gl, gl.NO_ERROR,
+ "uniform1i can set a sampler uniform");
+ gl.uniform1iv(textureLoc, [1]);
+ glErrorShouldBe(gl, gl.NO_ERROR,
+ "uniform1iv can set a sampler uniform");
+ gl.uniform1iv(textureLoc, testInt32Array);
+ glErrorShouldBe(gl, gl.NO_ERROR,
+ "uniform1iv can set a sampler uniform");
+ gl.uniform1f(textureLoc, 1);
+ glErrorShouldBe(gl, gl.INVALID_OPERATION,
+ "uniform1f returns INVALID_OPERATION if attempting to set a sampler uniform");
+ gl.uniform1fv(textureLoc, [1]);
+ glErrorShouldBe(gl, gl.INVALID_OPERATION,
+ "uniform1fv returns INVALID_OPERATION if attempting to set a sampler uniform");
+
+ var maxTextureUnits = gl.getParameter(gl.MAX_COMBINED_TEXTURE_IMAGE_UNITS);
+
+ var success = true;
+ for (var ii = 0; ii < maxTextureUnits; ++ii) {
+ gl.uniform1i(textureLoc, ii);
+ success = success && (gl.getError() == gl.NO_ERROR);
+ }
+ expectTrue(success, "uniform1i works for any valid texture unit");
+
+ var success = true;
+ for (var ii = 0; ii < maxTextureUnits; ++ii) {
+ gl.uniform1iv(textureLoc, [ii]);
+ success = success && (gl.getError() == gl.NO_ERROR);
+ }
+ expectTrue(success, "uniform1iv works for any valid texture unit");
+
+ var success = true;
+ for (var ii = maxTextureUnits; ii < 0x10000; ++ii) {
+ gl.uniform1i(textureLoc, ii);
+ success = success && (gl.getError() == gl.INVALID_VALUE);
+ }
+ expectTrue(success, "uniform1i generates INVALID_VALUE for invalid texture units");
+
+ var success = true;
+ for (var ii = maxTextureUnits; ii < 0x10000; ++ii) {
+ gl.uniform1iv(textureLoc, [ii]);
+ success = success && (gl.getError() == gl.INVALID_VALUE);
+ }
+ expectTrue(success, "uniform1iv generates INVALID_VALUE for invalid texture units");
+
+}
+
+init();
+var successfullyParsed = true;
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161683 => 161684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-10 23:17:57 UTC (rev 161683)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 23:28:29 UTC (rev 161684)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-10 Brent Fulgham <bfulgham@apple.com>
+
+ [WebGL] Correct uniform input validation for texture sampler uniform
+ https://bugs.webkit.org/show_bug.cgi?id=126775
+
+ Reviewed by Dean Jackson.
+
+ Added fast/canvas/webgl/uniform-samplers-test.html
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::uniform1iv): Access Int32Array data properly.
+
</ins><span class="cx"> 2014-01-10 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Unreviewed build fix after r161644.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (161683 => 161684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-01-10 23:17:57 UTC (rev 161683)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-01-10 23:28:29 UTC (rev 161684)
</span><span class="lines">@@ -4208,8 +4208,9 @@
</span><span class="cx">
</span><span class="cx"> if (location->type() == GraphicsContext3D::SAMPLER_2D || location->type() == GraphicsContext3D::SAMPLER_CUBE)
</span><span class="cx"> for (unsigned i = 0; i < v->length(); ++i) {
</span><del>- if (((GC3Dint*)v)[i] >= static_cast<int>(m_textureUnits.size())) {
- synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "uniform1i", "invalid texture unit");
</del><ins>+ if (v->data()[i] >= static_cast<int>(m_textureUnits.size())) {
+ LOG(WebGL, "Texture unit size=%zu, v[%d]=%d. Location type = %04X.", m_textureUnits.size(), i, v->data()[i], location->type());
+ synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "uniform1iv", "invalid texture unit");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -4227,7 +4228,7 @@
</span><span class="cx"> if (location->type() == GraphicsContext3D::SAMPLER_2D || location->type() == GraphicsContext3D::SAMPLER_CUBE)
</span><span class="cx"> for (unsigned i = 0; i < static_cast<unsigned>(size); ++i) {
</span><span class="cx"> if (((GC3Dint*)v)[i] >= static_cast<int>(m_textureUnits.size())) {
</span><del>- synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "uniform1i", "invalid texture unit");
</del><ins>+ synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "uniform1iv", "invalid texture unit");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>