diff options
author | wilmoz <wcubasalas@gmail.com> | 2015-08-25 10:02:57 -0500 |
---|---|---|
committer | wilmoz <wcubasalas@gmail.com> | 2015-08-25 13:04:55 -0500 |
commit | 363183d12a43dfd4f639bd149804157b38738268 (patch) | |
tree | db8ed95880626e75c228a6e2269cf56131031552 /components/script/dom/webglrenderingcontext.rs | |
parent | f79220f1a8bcb47d8248356f303c7b3673322905 (diff) | |
download | servo-363183d12a43dfd4f639bd149804157b38738268.tar.gz servo-363183d12a43dfd4f639bd149804157b38738268.zip |
Make handle_potential_webgl_error more ergonomic
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
-rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 2effacd8c59..22d7dfa3116 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -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); } |