b=593850; [webgl] fix gl-uniform-arrays test; r=bjacob
authorVladimir Vukicevic <vladimir@pobox.com>
Mon, 13 Sep 2010 08:55:45 -0700
changeset 53698 03088339b4cea8282c6081f48c0273c9afc2b2fa
parent 53697 1e28bb98f18815ff99015d99399530cb28ca877c
child 53699 71a1c97127a1a2f546cc6825851e8c0173fad7a5
push idunknown
push userunknown
push dateunknown
reviewersbjacob
bugs593850
milestone2.0b6pre
b=593850; [webgl] fix gl-uniform-arrays test; r=bjacob
content/canvas/src/WebGLContextGL.cpp
content/canvas/test/webgl/failing_tests.txt
--- a/content/canvas/src/WebGLContextGL.cpp
+++ b/content/canvas/src/WebGLContextGL.cpp
@@ -2869,17 +2869,17 @@ WebGLContext::name(PRInt32 dummy) {     
 }                                                                       \
 NS_IMETHODIMP                                                           \
 WebGLContext::name##_array(nsIWebGLUniformLocation *ploc, js::TypedArray *wa) \
 {                                                                       \
     OBTAIN_UNIFORM_LOCATION(#name ": location")                         \
     if (!wa || wa->type != js::TypedArray::arrayType)                   \
         return ErrorInvalidOperation(#name ": array must be " #arrayType);      \
     if (wa->length == 0 || wa->length % cnt != 0)                       \
-        return ErrorInvalidOperation(#name ": array must be > 0 elements and have a length multiple of %d", cnt); \
+        return ErrorInvalidValue(#name ": array must be > 0 elements and have a length multiple of %d", cnt); \
     MakeContextCurrent();                                               \
     gl->f##name(location, wa->length / cnt, (ptrType *)wa->data);            \
     return NS_OK;                                                       \
 }
 
 #define SIMPLE_MATRIX_METHOD_UNIFORM(name, dim, arrayType, ptrType)     \
 NS_IMETHODIMP                                                           \
 WebGLContext::name(PRInt32 dummy) {                                     \
--- a/content/canvas/test/webgl/failing_tests.txt
+++ b/content/canvas/test/webgl/failing_tests.txt
@@ -10,17 +10,16 @@ conformance/context-type-test.html
 conformance/framebuffer-object-attachment.html
 conformance/get-active-test.html
 conformance/gl-bind-attrib-location-test.html
 conformance/gl-enum-tests.html
 conformance/gl-get-active-attribute.html
 conformance/gl-get-calls.html
 conformance/gl-object-get-calls.html
 conformance/gl-teximage.html
-conformance/gl-uniform-arrays.html
 conformance/gl-unknown-uniform.html
 conformance/glsl-2types-of-textures-on-same-unit.html
 conformance/glsl-conformance.html
 conformance/invalid-passed-params.html
 conformance/methods.html
 conformance/null-object-behaviour.html
 conformance/null-uniform-location.html
 conformance/point-size.html