diff options
author | David Zbarsky <dzbarsky@gmail.com> | 2015-11-28 18:38:14 -0800 |
---|---|---|
committer | David Zbarsky <dzbarsky@gmail.com> | 2015-12-13 17:39:20 -0800 |
commit | 0f4d6d58aa994b14ac70cc098099ac68b6269631 (patch) | |
tree | 4abbaf37f55ba94b2d8db4b991af5385efe956e8 /components/script/dom/webglshader.rs | |
parent | a1fb12616a29d2190baadd20d7763af1d9c02260 (diff) | |
download | servo-0f4d6d58aa994b14ac70cc098099ac68b6269631.tar.gz servo-0f4d6d58aa994b14ac70cc098099ac68b6269631.zip |
Implement various WebGL functions
Diffstat (limited to 'components/script/dom/webglshader.rs')
-rw-r--r-- | components/script/dom/webglshader.rs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/components/script/dom/webglshader.rs b/components/script/dom/webglshader.rs index 9d52030c56a..8046fd5f5ed 100644 --- a/components/script/dom/webglshader.rs +++ b/components/script/dom/webglshader.rs @@ -4,9 +4,8 @@ // https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl use angle::hl::{BuiltInResources, Output, ShaderValidator}; -use canvas_traits::{CanvasMsg, CanvasWebGLMsg, WebGLError, WebGLResult, WebGLShaderParameter}; +use canvas_traits::{CanvasMsg, CanvasWebGLMsg, WebGLResult, WebGLParameter}; use dom::bindings::cell::DOMRefCell; -use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants; use dom::bindings::codegen::Bindings::WebGLShaderBinding; use dom::bindings::global::GlobalRef; use dom::bindings::js::Root; @@ -132,16 +131,11 @@ impl WebGLShader { self.info_log.borrow().clone() } - /// glGetShaderParameter - pub fn parameter(&self, param_id: u32) -> WebGLResult<WebGLShaderParameter> { - match param_id { - constants::SHADER_TYPE | constants::DELETE_STATUS | constants::COMPILE_STATUS => {}, - _ => return Err(WebGLError::InvalidEnum), - } - + /// glGetParameter + pub fn parameter(&self, param_id: u32) -> WebGLResult<WebGLParameter> { let (sender, receiver) = ipc::channel().unwrap(); self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::GetShaderParameter(self.id, param_id, sender))).unwrap(); - Ok(receiver.recv().unwrap()) + receiver.recv().unwrap() } /// Get the shader source |