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

Check the bound buffer element array only for count > 0 in gl.drawElements

Browse source 
See https://www.khronos.org/registry/webgl/specs/latest/1.0/#6.2
This commit is contained in:
Anthony Ramine 2018-04-16 16:23:13 +02:00
parent 7f1590dac0
commit d16a73001f
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2183,19 +2183,21 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
return self.webgl_error(InvalidOperation); return self.webgl_error(InvalidOperation);
} }
if let Some(array_buffer) = self.bound_buffer_element_array.get() { if count > 0 {
// WebGL Spec: check buffer overflows, must be a valid multiple of the size. if let Some(array_buffer) = self.bound_buffer_element_array.get() {
let val = offset as u64 + (count as u64 * type_size as u64); // WebGL Spec: check buffer overflows, must be a valid multiple of the size.
if val > array_buffer.capacity() as u64 { let val = offset as u64 + (count as u64 * type_size as u64);
if val > array_buffer.capacity() as u64 {
return self.webgl_error(InvalidOperation);
}
} else {
// From the WebGL spec
//
// a non-null WebGLBuffer must be bound to the ELEMENT_ARRAY_BUFFER binding point
// or an INVALID_OPERATION error will be generated.
//
return self.webgl_error(InvalidOperation); return self.webgl_error(InvalidOperation);
} }
} else {
// From the WebGL spec
//
// a non-null WebGLBuffer must be bound to the ELEMENT_ARRAY_BUFFER binding point
// or an INVALID_OPERATION error will be generated.
//
return self.webgl_error(InvalidOperation);
} }
if !self.validate_framebuffer_complete() { if !self.validate_framebuffer_complete() {