Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-19 14:48:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use WebGLResult for returns of instanced draw methods

Browse source
This commit is contained in:
Anthony Ramine 2018-09-06 10:41:58 +02:00
parent 5063ac465b
commit 0579fbe4fa
3 changed files with 43 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/webgl2renderingcontext.rs
View file

@ -961,7 +961,10 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
count: i32,
primcount: i32,
) {
self.base.draw_arrays_instanced(mode, first, count, primcount);
handle_potential_webgl_error!(
self.base,
self.base.draw_arrays_instanced(mode, first, count, primcount)
)
}
/// https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.9
@ -973,7 +976,10 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
offset: i64,
primcount: i32,
) {
self.base.draw_elements_instanced(mode, count, type_, offset, primcount);
handle_potential_webgl_error!(
self.base,
self.base.draw_elements_instanced(mode, count, type_, offset, primcount)
)
}
/// https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.9

10
components/script/dom/webgl_extensions/ext/angleinstancedarrays.rs
View file

@ -71,7 +71,10 @@ impl ANGLEInstancedArraysMethods for ANGLEInstancedArrays {
count: i32,
primcount: i32,
) {
self.ctx.draw_arrays_instanced(mode, first, count, primcount);
handle_potential_webgl_error!(
self.ctx,
self.ctx.draw_arrays_instanced(mode, first, count, primcount)
)
}
// https://www.khronos.org/registry/webgl/extensions/ANGLE_instanced_arrays/
@ -83,7 +86,10 @@ impl ANGLEInstancedArraysMethods for ANGLEInstancedArrays {
offset: i64,
primcount: i32,
) {
self.ctx.draw_elements_instanced(mode, count, type_, offset, primcount);
handle_potential_webgl_error!(
self.ctx,
self.ctx.draw_elements_instanced(mode, count, type_, offset, primcount)
)
}
fn VertexAttribDivisorANGLE(&self, index: u32, divisor: u32) {

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

@ -1076,48 +1076,40 @@ impl WebGLRenderingContext {
first: i32,
count: i32,
primcount: i32,
) {
) -> WebGLResult<()> {
match mode {
constants::POINTS | constants::LINE_STRIP |
constants::LINE_LOOP | constants::LINES |
constants::TRIANGLE_STRIP | constants::TRIANGLE_FAN |
constants::TRIANGLES => {},
_ => {
return self.webgl_error(InvalidEnum);
return Err(InvalidEnum);
}
}
if first < 0 || count < 0 || primcount < 0 {
return self.webgl_error(InvalidValue);
return Err(InvalidValue);
}
let current_program = handle_potential_webgl_error!(
self,
self.current_program.get().ok_or(InvalidOperation),
return
);
let current_program = self.current_program.get().ok_or(InvalidOperation)?;
let required_len = if count > 0 {
handle_potential_webgl_error!(
self,
first.checked_add(count).map(|len| len as u32).ok_or(InvalidOperation),
return
)
first.checked_add(count).map(|len| len as u32).ok_or(InvalidOperation)?
} else {
0
};
handle_potential_webgl_error!(
self,
self.current_vao().validate_for_draw(required_len, primcount as u32, &current_program.active_attribs()),
return
);
self.current_vao().validate_for_draw(
required_len,
primcount as u32,
&current_program.active_attribs(),
)?;
if !self.validate_framebuffer_complete() {
return;
return Ok(());
}
if count == 0 || primcount == 0 {
return;
return Ok(());
}
self.send_command(if primcount == 1 {
@ -1126,6 +1118,7 @@ impl WebGLRenderingContext {
WebGLCommand::DrawArraysInstanced { mode, first, count, primcount }
});
self.mark_as_dirty();
Ok(())
}
// https://www.khronos.org/registry/webgl/extensions/ANGLE_instanced_arrays/
@ -1136,62 +1129,49 @@ impl WebGLRenderingContext {
type_: u32,
offset: i64,
primcount: i32,
) {
) -> WebGLResult<()> {
match mode {
constants::POINTS | constants::LINE_STRIP |
constants::LINE_LOOP | constants::LINES |
constants::TRIANGLE_STRIP | constants::TRIANGLE_FAN |
constants::TRIANGLES => {},
_ => {
return self.webgl_error(InvalidEnum);
return Err(InvalidEnum);
}
}
if count < 0 || offset < 0 || primcount < 0 {
return self.webgl_error(InvalidValue);
return Err(InvalidValue);
}
let type_size = match type_ {
constants::UNSIGNED_BYTE => 1,
constants::UNSIGNED_SHORT => 2,
constants::UNSIGNED_INT if self.extension_manager.is_element_index_uint_enabled() => 4,
_ => return self.webgl_error(InvalidEnum),
_ => return Err(InvalidEnum),
};
if offset % type_size != 0 {
return self.webgl_error(InvalidOperation);
return Err(InvalidOperation);
}
let current_program = handle_potential_webgl_error!(
self,
self.current_program.get().ok_or(InvalidOperation),
return
);
let array_buffer = handle_potential_webgl_error!(
self,
self.current_vao().element_array_buffer().get().ok_or(InvalidOperation),
return
);
let current_program = self.current_program.get().ok_or(InvalidOperation)?;
let array_buffer = self.current_vao().element_array_buffer().get().ok_or(InvalidOperation)?;
if count > 0 && primcount > 0 {
// This operation cannot overflow in u64 and we know all those values are nonnegative.
let val = offset as u64 + (count as u64 * type_size as u64);
if val > array_buffer.capacity() as u64 {
return self.webgl_error(InvalidOperation);
return Err(InvalidOperation);
}
}
// TODO(nox): Pass the correct number of vertices required.
handle_potential_webgl_error!(
self,
self.current_vao().validate_for_draw(0, primcount as u32, &current_program.active_attribs()),
return
);
self.current_vao().validate_for_draw(0, primcount as u32, &current_program.active_attribs())?;
if !self.validate_framebuffer_complete() {
return;
return Ok(());
}
if count == 0 || primcount == 0 {
return;
return Ok(());
}
let offset = offset as u32;
@ -1201,6 +1181,7 @@ impl WebGLRenderingContext {
WebGLCommand::DrawElementsInstanced { mode, count, type_, offset, primcount }
});
self.mark_as_dirty();
Ok(())
}
pub fn vertex_attrib_divisor(&self, index: u32, divisor: u32) {
@ -2328,12 +2309,12 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.11
fn DrawArrays(&self, mode: u32, first: i32, count: i32) {
self.draw_arrays_instanced(mode, first, count, 1);
handle_potential_webgl_error!(self, self.draw_arrays_instanced(mode, first, count, 1));
}
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.11
fn DrawElements(&self, mode: u32, count: i32, type_: u32, offset: i64) {
self.draw_elements_instanced(mode, count, type_, offset, 1);
handle_potential_webgl_error!(self, self.draw_elements_instanced(mode, count, type_, offset, 1));
}
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10