Commit 595965d0 authored by eric@webkit.org's avatar eric@webkit.org

2010-05-20 Zhenyao Mo <zmo@google.com>

        Reviewed by Dimitri Glazkov.

        fast/canvas/webgl/texture-npot.html failed on leopard bot
        https://bugs.webkit.org/show_bug.cgi?id=39128

        * fast/canvas/webgl/texture-npot-expected.txt: Adding the failed test cases back.
        * fast/canvas/webgl/texture-npot.html:
        * platform/mac-leopard/Skipped: Skip texture-npot.html on leopard for now.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@59899 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ece3d66e
2010-05-20 Zhenyao Mo <zmo@google.com>
Reviewed by Dimitri Glazkov.
fast/canvas/webgl/texture-npot.html failed on leopard bot
https://bugs.webkit.org/show_bug.cgi?id=39128
* fast/canvas/webgl/texture-npot-expected.txt: Adding the failed test cases back.
* fast/canvas/webgl/texture-npot.html:
* platform/mac-leopard/Skipped: Skip texture-npot.html on leopard for now.
2010-05-20 Zhenyao Mo <zmo@google.com>
Reviewed by Dimitri Glazkov.
......@@ -3,6 +3,9 @@ WebGL NPOT texture conformance test
PASS gl.texImage2D with NPOT texture with level > 0 should return INVALID_VALUE
PASS gl.texImage2D with NPOT texture at level 0 should succeed
PASS gl.generateMipmap with NPOT texture should return INVALID_OPERATION
PASS NPOT texture with TEXTURE_WRAP set to REPEAT should draw with 0,0,0,255
PASS NPOT texture with TEXTURE_MIN_FILTER not NEAREST or LINEAR should draw with 0,0,0,255
PASS NPOT texture with TEXTURE_MIN_FILTER set to LINEAR should draw with 0,192,128,255
PASS successfullyParsed is true
TEST COMPLETE
......
......@@ -110,17 +110,17 @@
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.REPEAT);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.REPEAT);
// checkBuffer(0,0,0,255, "NPOT texture with TEXTURE_WRAP set to REPEAT should draw with 0,0,0,255");
checkBuffer(0,0,0,255, "NPOT texture with TEXTURE_WRAP set to REPEAT should draw with 0,0,0,255");
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST_MIPMAP_LINEAR);
// checkBuffer(0,0,0,255, "NPOT texture with TEXTURE_MIN_FILTER not NEAREST or LINEAR should draw with 0,0,0,255");
checkBuffer(0,0,0,255, "NPOT texture with TEXTURE_MIN_FILTER not NEAREST or LINEAR should draw with 0,0,0,255");
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
// checkBuffer(0,192,128,255, "NPOT texture with TEXTURE_MIN_FILTER set to LINEAR should draw.");
checkBuffer(0,192,128,255, "NPOT texture with TEXTURE_MIN_FILTER set to LINEAR should draw with 0,192,128,255");
function checkBuffer(r, g, b, a, msg) {
gl.clearColor(1,1,1,1);
......@@ -134,7 +134,8 @@
buf[offset + 1] != g ||
buf[offset + 2] != b ||
buf[offset + 3] != a) {
testFailed(msg);
testFailed(msg + ', read back color is ' + buf[offset + 0] + ',' + buf[offset + 1]
+ ',' + buf[offset + 2] + ',' + buf[offset + 3]);
return;
}
}
......
......@@ -70,3 +70,7 @@ http/tests/media/video-play-stall-seek.html
# IndexedDB is not yet enabled.
storage/indexeddb
# Disable the test until the mesa renderer is integrated.
# https://bugs.webkit.org/show_bug.cgi?id=39128
fast/canvas/webgl/texture-npot.html
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment