Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix the error for invalid arrays passed to gl.vertexAttrib*v()

Browse source
This commit is contained in:
Anthony Ramine 2018-08-25 14:07:59 +02:00
parent 273aac87e4
commit 0ba66f9f12
2 changed files with 8 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/script/dom/webglrenderingcontext.rs
View file

@ -3643,7 +3643,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v, Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
}; };
if values.len() < 1 { if values.len() < 1 {
return self.webgl_error(InvalidOperation); // https://github.com/KhronosGroup/WebGL/issues/2700
return self.webgl_error(InvalidValue);
} }
self.vertex_attrib(indx, values[0], 0f32, 0f32, 1f32); self.vertex_attrib(indx, values[0], 0f32, 0f32, 1f32);
} }
@ -3660,7 +3661,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v, Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
}; };
if values.len() < 2 { if values.len() < 2 {
return self.webgl_error(InvalidOperation); // https://github.com/KhronosGroup/WebGL/issues/2700
return self.webgl_error(InvalidValue);
} }
self.vertex_attrib(indx, values[0], values[1], 0f32, 1f32); self.vertex_attrib(indx, values[0], values[1], 0f32, 1f32);
} }
@ -3677,7 +3679,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v, Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
}; };
if values.len() < 3 { if values.len() < 3 {
return self.webgl_error(InvalidOperation); // https://github.com/KhronosGroup/WebGL/issues/2700
return self.webgl_error(InvalidValue);
} }
self.vertex_attrib(indx, values[0], values[1], values[2], 1f32); self.vertex_attrib(indx, values[0], values[1], values[2], 1f32);
} }
@ -3694,7 +3697,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v, Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
}; };
if values.len() < 4 { if values.len() < 4 {
return self.webgl_error(InvalidOperation); // https://github.com/KhronosGroup/WebGL/issues/2700
return self.webgl_error(InvalidValue);
} }
self.vertex_attrib(indx, values[0], values[1], values[2], values[3]); self.vertex_attrib(indx, values[0], values[1], values[2], values[3]);
} }

25
tests/wpt/webgl/meta/conformance/attribs/gl-vertex-attrib.html.ini
View file

@ -1,25 +0,0 @@
[gl-vertex-attrib.html]
[WebGL test #979: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
expected: FAIL
[WebGL test #978: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
expected: FAIL
[WebGL test #976: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
expected: FAIL
[WebGL test #980: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
expected: FAIL
[WebGL test #975: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
expected: FAIL
[WebGL test #977: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
expected: FAIL
[WebGL test #982: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
expected: FAIL
[WebGL test #981: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
expected: FAIL