Thu, 15 Jan 2015 21:03:48 +0100
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
michael@0 | 1 | <!-- |
michael@0 | 2 | Copyright (c) 2011 The Chromium Authors. All rights reserved. |
michael@0 | 3 | Use of this source code is governed by a BSD-style license that can be |
michael@0 | 4 | found in the LICENSE file. |
michael@0 | 5 | --> |
michael@0 | 6 | <!DOCTYPE html> |
michael@0 | 7 | <html> |
michael@0 | 8 | <head> |
michael@0 | 9 | <meta charset="utf-8"> |
michael@0 | 10 | <link rel="stylesheet" href="../../resources/js-test-style.css"/> |
michael@0 | 11 | <script src="../../resources/js-test-pre.js"></script> |
michael@0 | 12 | <script src="../resources/webgl-test.js"></script> |
michael@0 | 13 | <script src="../resources/webgl-test-utils.js"></script> |
michael@0 | 14 | <script> |
michael@0 | 15 | var wtu = WebGLTestUtils; |
michael@0 | 16 | var gl = null; |
michael@0 | 17 | var textureLoc = null; |
michael@0 | 18 | var successfullyParsed = false; |
michael@0 | 19 | var imageData = null; |
michael@0 | 20 | |
michael@0 | 21 | function init() |
michael@0 | 22 | { |
michael@0 | 23 | if (window.initNonKhronosFramework) { |
michael@0 | 24 | window.initNonKhronosFramework(true); |
michael@0 | 25 | } |
michael@0 | 26 | |
michael@0 | 27 | description('Verify texImage2D and texSubImage2D code paths taking ImageData'); |
michael@0 | 28 | |
michael@0 | 29 | var canvas2d = document.getElementById("texcanvas"); |
michael@0 | 30 | var context2d = canvas2d.getContext("2d"); |
michael@0 | 31 | imageData = context2d.createImageData(1, 2); |
michael@0 | 32 | var data = imageData.data; |
michael@0 | 33 | data[0] = 255; |
michael@0 | 34 | data[1] = 0; |
michael@0 | 35 | data[2] = 0; |
michael@0 | 36 | data[3] = 255; |
michael@0 | 37 | data[4] = 0; |
michael@0 | 38 | data[5] = 255; |
michael@0 | 39 | data[6] = 0; |
michael@0 | 40 | data[7] = 0; |
michael@0 | 41 | |
michael@0 | 42 | wtu = WebGLTestUtils; |
michael@0 | 43 | var canvas = document.getElementById("example"); |
michael@0 | 44 | gl = wtu.create3DContext(canvas); |
michael@0 | 45 | var program = wtu.setupTexturedQuad(gl); |
michael@0 | 46 | gl.clearColor(0,0,0,1); |
michael@0 | 47 | gl.clearDepth(1); |
michael@0 | 48 | gl.disable(gl.BLEND); |
michael@0 | 49 | |
michael@0 | 50 | textureLoc = gl.getUniformLocation(program, "tex"); |
michael@0 | 51 | |
michael@0 | 52 | runTest(); |
michael@0 | 53 | } |
michael@0 | 54 | |
michael@0 | 55 | // These two declarations need to be global for "shouldBe" to see them |
michael@0 | 56 | var buf = null; |
michael@0 | 57 | var idx = 0; |
michael@0 | 58 | var pixel = [0, 0, 0, 1]; |
michael@0 | 59 | var correctColor = null; |
michael@0 | 60 | |
michael@0 | 61 | function runOneIteration(useTexSubImage2D, flipY, premultiplyAlpha, topColor, bottomColor) |
michael@0 | 62 | { |
michael@0 | 63 | debug('Testing ' + (useTexSubImage2D ? 'texSubImage2D' : 'texImage2D') + |
michael@0 | 64 | ' with flipY=' + flipY + ' and premultiplyAlpha=' + premultiplyAlpha); |
michael@0 | 65 | gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT); |
michael@0 | 66 | // Enable writes to the RGBA channels |
michael@0 | 67 | gl.colorMask(1, 1, 1, 0); |
michael@0 | 68 | var texture = gl.createTexture(); |
michael@0 | 69 | // Bind the texture to texture unit 0 |
michael@0 | 70 | gl.bindTexture(gl.TEXTURE_2D, texture); |
michael@0 | 71 | // Set up texture parameters |
michael@0 | 72 | gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST); |
michael@0 | 73 | gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST); |
michael@0 | 74 | // Set up pixel store parameters |
michael@0 | 75 | gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, flipY); |
michael@0 | 76 | gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, premultiplyAlpha); |
michael@0 | 77 | // Upload the image into the texture |
michael@0 | 78 | if (useTexSubImage2D) { |
michael@0 | 79 | // Initialize the texture to black first |
michael@0 | 80 | gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 1, 2, 0, |
michael@0 | 81 | gl.RGBA, gl.UNSIGNED_BYTE, null); |
michael@0 | 82 | gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, gl.RGBA, gl.UNSIGNED_BYTE, imageData); |
michael@0 | 83 | } else { |
michael@0 | 84 | gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, imageData); |
michael@0 | 85 | } |
michael@0 | 86 | |
michael@0 | 87 | // Point the uniform sampler to texture unit 0 |
michael@0 | 88 | gl.uniform1i(textureLoc, 0); |
michael@0 | 89 | // Draw the triangles |
michael@0 | 90 | wtu.drawQuad(gl, [0, 0, 0, 255]); |
michael@0 | 91 | |
michael@0 | 92 | // Read back the rendering results |
michael@0 | 93 | buf = new Uint8Array(1 * 2 * 4); |
michael@0 | 94 | gl.readPixels(0, 0, 1, 2, gl.RGBA, gl.UNSIGNED_BYTE, buf); |
michael@0 | 95 | // Check the top pixel and bottom pixel and make sure they have |
michael@0 | 96 | // the right color. |
michael@0 | 97 | debug("Checking bottom pixel"); |
michael@0 | 98 | wtu.checkCanvasRect(gl, 0, 0, 1, 1, bottomColor, "shouldBe " + bottomColor); |
michael@0 | 99 | debug("Checking top pixel"); |
michael@0 | 100 | wtu.checkCanvasRect(gl, 0, 1, 1, 1, topColor, "shouldBe " + topColor); |
michael@0 | 101 | } |
michael@0 | 102 | |
michael@0 | 103 | function runTest() |
michael@0 | 104 | { |
michael@0 | 105 | var red = [255, 0, 0, 255]; |
michael@0 | 106 | var green = [0, 255, 0, 255]; |
michael@0 | 107 | var redPremultiplyAlpha = [255, 0, 0, 255]; |
michael@0 | 108 | var greenPremultiplyAlpha = [0, 0, 0, 255]; |
michael@0 | 109 | |
michael@0 | 110 | runOneIteration(false, true, false, |
michael@0 | 111 | red, green); |
michael@0 | 112 | runOneIteration(false, false, false, |
michael@0 | 113 | green, red); |
michael@0 | 114 | runOneIteration(false, true, true, |
michael@0 | 115 | redPremultiplyAlpha, greenPremultiplyAlpha); |
michael@0 | 116 | runOneIteration(false, false, true, |
michael@0 | 117 | greenPremultiplyAlpha, redPremultiplyAlpha); |
michael@0 | 118 | runOneIteration(true, true, false, |
michael@0 | 119 | red, green); |
michael@0 | 120 | runOneIteration(true, false, false, |
michael@0 | 121 | green, red); |
michael@0 | 122 | runOneIteration(true, true, true, |
michael@0 | 123 | redPremultiplyAlpha, greenPremultiplyAlpha); |
michael@0 | 124 | runOneIteration(true, false, true, |
michael@0 | 125 | greenPremultiplyAlpha, redPremultiplyAlpha); |
michael@0 | 126 | |
michael@0 | 127 | glErrorShouldBe(gl, gl.NO_ERROR, "should be no errors"); |
michael@0 | 128 | finishTest(); |
michael@0 | 129 | } |
michael@0 | 130 | </script> |
michael@0 | 131 | </head> |
michael@0 | 132 | <body onload="init()"> |
michael@0 | 133 | <canvas id="texcanvas" width="1px" height="2px"></canvas> |
michael@0 | 134 | <canvas id="example" width="1px" height="2px"></canvas> |
michael@0 | 135 | <div id="description"></div> |
michael@0 | 136 | <div id="console"></div> |
michael@0 | 137 | </body> |
michael@0 | 138 | </html> |