Bug 697211 - fixed stride not being returned correctly from getVertexAttrib. r=jgilbert
☠☠ backed out by b4e12c6014e3 ☠ ☠
authorDoug Sherk <dsherk@mozilla.com>
Mon, 31 Oct 2011 17:49:55 -0700
changeset 79489 773e9705c61bb9fed919e051d3cb99a41ecd100d
parent 79488 4f67677970f214cdcf3770d7096f054d4490404b
child 79490 b4e12c6014e3cc340c362fdf49a4b10fd72e6b25
push id21408
push userkhuey@mozilla.com
push dateTue, 01 Nov 2011 14:32:20 +0000
treeherdermozilla-central@cd9add22f090 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs697211
milestone10.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 697211 - fixed stride not being returned correctly from getVertexAttrib. r=jgilbert
content/canvas/src/WebGLContextGL.cpp
content/canvas/test/webgl/failing_tests_mac.txt
--- a/content/canvas/src/WebGLContextGL.cpp
+++ b/content/canvas/src/WebGLContextGL.cpp
@@ -3009,18 +3009,21 @@ WebGLContext::GetVertexAttrib(WebGLuint 
 
     MakeContextCurrent();
 
     switch (pname) {
         case LOCAL_GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING:
             wrval->SetAsISupports(mAttribBuffers[index].buf);
             break;
 
+        case LOCAL_GL_VERTEX_ATTRIB_ARRAY_STRIDE:
+            wrval->SetAsInt32(mAttribBuffers[index].stride);
+            break;
+
         case LOCAL_GL_VERTEX_ATTRIB_ARRAY_SIZE:
-        case LOCAL_GL_VERTEX_ATTRIB_ARRAY_STRIDE:
         case LOCAL_GL_VERTEX_ATTRIB_ARRAY_TYPE:
         {
             GLint i = 0;
             gl->fGetVertexAttribiv(index, pname, &i);
             wrval->SetAsInt32(i);
         }
             break;
 
--- a/content/canvas/test/webgl/failing_tests_mac.txt
+++ b/content/canvas/test/webgl/failing_tests_mac.txt
@@ -1,12 +1,11 @@
 conformance/context/premultiplyalpha-test.html
 conformance/glsl/misc/glsl-function-nodes.html
 conformance/glsl/misc/glsl-long-variable-names.html
 conformance/glsl/misc/shader-with-256-character-identifier.frag.html
 conformance/glsl/misc/shader-with-long-line.html
 conformance/programs/program-test.html
-conformance/state/gl-object-get-calls.html
 conformance/textures/texture-mips.html
 conformance/textures/texture-npot.html
 conformance/more/conformance/quickCheckAPI-S_V.html
 conformance/more/functions/uniformfBadArgs.html
 conformance/more/functions/uniformiBadArgs.html