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

Make handle_potential_webgl_error more ergonomic

Browse source
This commit is contained in:
wilmoz 2015-08-25 10:02:57 -05:00
parent f79220f1a8
commit 363183d12a
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,7 +59,10 @@ macro_rules! handle_potential_webgl_error {
$return_on_error
}
}
}
};
($context:ident, $call:expr) => {
handle_potential_webgl_error!($context, $call, ());
};
}
/// Set of bitflags for texture unpacking (texImage2d, etc...)
@ -269,7 +272,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext {
fn AttachShader(self, program: Option<&WebGLProgram>, shader: Option<&WebGLShader>) {
if let Some(program) = program {
if let Some(shader) = shader {
handle_potential_webgl_error!(self, program.attach_shader(shader), ());
handle_potential_webgl_error!(self, program.attach_shader(shader));
}
}
}
@ -284,7 +287,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext {
}
if let Some(buffer) = buffer {
handle_potential_webgl_error!(self, buffer.bind(target), ())
handle_potential_webgl_error!(self, buffer.bind(target))
} else {
// Unbind the current buffer
self.ipc_renderer
@ -876,7 +879,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext {
if let Some(texture) = self.bound_texture_for(target) {
let texture = texture.root();
let result = texture.r().tex_parameter(target, name, TexParameterValue::Float(value));
handle_potential_webgl_error!(self, result, ());
handle_potential_webgl_error!(self, result);
} else {
return self.webgl_error(InvalidOperation);
}
@ -894,7 +897,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext {
if let Some(texture) = self.bound_texture_for(target) {
let texture = texture.root();
let result = texture.r().tex_parameter(target, name, TexParameterValue::Int(value));
handle_potential_webgl_error!(self, result, ());
handle_potential_webgl_error!(self, result);
} else {
return self.webgl_error(InvalidOperation);
}