Add a test for texImage3D from ImageData with unpack params (#2646)

Regression test for https://crbug.com/804123
KhronosGroup · May 11, 2018 · 2e7b0de · 2e7b0de
1 parent 24d8b38
commit 2e7b0de
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 0 deletions.
diff --git a/sdk/tests/conformance2/textures/misc/00_test_list.txt b/sdk/tests/conformance2/textures/misc/00_test_list.txt
@@ -30,6 +30,7 @@ tex-storage-and-subimage-3d.html
 tex-storage-compressed-formats.html
 --min-version 2.0.1 tex-subimage3d-pixel-buffer-bug.html
 tex-unpack-params.html
+--min-version 2.0.1 tex-unpack-params-imagedata.html
 --min-version 2.0.1 tex-unpack-params-with-flip-y-and-premultiply-alpha.html
 texel-fetch-undefined.html
 texture-npot.html
diff --git a/sdk/tests/conformance2/textures/misc/tex-unpack-params-imagedata.html b/sdk/tests/conformance2/textures/misc/tex-unpack-params-imagedata.html
@@ -0,0 +1,66 @@
+<!--
+
+/*
+** Copyright (c) 2018 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>WebGL2 TexImage3D from ImageData with unpack params tests.</title>
+<link rel="stylesheet" href="../../../resources/js-test-style.css"/>
+<script src="../../../js/js-test-pre.js"></script>
+<script src="../../../js/webgl-test-utils.js"></script>
+</head>
+<body>
+<div id="description"></div>
+<div id="console"></div>
+<script>
+var wtu = WebGLTestUtils;
+var gl = wtu.create3DContext(undefined, undefined, 2);
+
+description("TexImage3D from ImageData with unpack params");
+
+debug("TexImage3D from ImageData with UNPACK_IMAGE_HEIGHT set (crbug.com/804123)");
+
+let imageData = new ImageData(64, 64);
+let texture = gl.createTexture();
+gl.bindTexture(gl.TEXTURE_3D, texture);
+
+gl.pixelStorei(gl.UNPACK_IMAGE_HEIGHT, 2);
+gl.texImage3D(gl.TEXTURE_3D, 0, gl.R8, 1, 1, 1, 0, gl.RED, gl.UNSIGNED_BYTE, imageData);
+wtu.glErrorShouldBe(gl, gl.NO_ERROR, "small upload");
+
+gl.pixelStorei(gl.UNPACK_IMAGE_HEIGHT, 7);
+gl.texImage3D(gl.TEXTURE_3D, 0, gl.RGBA8, 4, 4, 4, 0, gl.RGBA, gl.UNSIGNED_BYTE, imageData);
+wtu.glErrorShouldBe(gl, gl.NO_ERROR, "larger upload");
+
+gl.deleteTexture(texture);
+
+var successfullyParsed = true;
+</script>
+<script src="../../../js/js-test-post.js"></script>
+</body>
+</html>