Bug 591042 - validation fix in copyTexImage2D and update list of failing tests - r=vladimir, a=blocking2.0

This commit is contained in:
Benoit Jacob 2010-09-02 10:28:38 -04:00
parent 7db127ab8d
commit 970240fc6f
2 changed files with 6 additions and 2 deletions

View File

@ -580,6 +580,12 @@ WebGLContext::CopyTexImage2D(WebGLenum target,
if (level < 0)
return ErrorInvalidValue("copyTexImage2D: level may not be negative");
if (level >= 1) {
if (!(is_pot_assuming_nonnegative(width) &&
is_pot_assuming_nonnegative(height)))
return ErrorInvalidValue("copyTexImage2D: with level > 0, width and height must be powers of two");
}
if (!CanvasUtils::CheckSaneSubrectSize(x,y,width, height, mWidth, mHeight))
return ErrorInvalidOperation("CopyTexImage2D: copied rectangle out of bounds");

View File

@ -38,14 +38,12 @@ conformance/tex-input-validation.html
conformance/texparameter-test.html
conformance/texture-active-bind-2.html
conformance/texture-formats-test.html
conformance/texture-npot.html
conformance/uniform-samplers-test.html
conformance/viewport-unchanged-upon-resize.html
more/conformance/constants.html
more/conformance/getContext.html
more/conformance/quickCheckAPI.html
more/conformance/quickCheckAPIBadArgs.html
more/conformance/webGLArrays.html
more/functions/bufferDataBadArgs.html
more/functions/copyTexImage2D.html
more/functions/copyTexImage2DBadArgs.html