diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2018-07-11 12:18:51 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2018-07-16 10:16:30 +0200 |
commit | e7631cea61b870db37d6b609e516ec64dd254849 (patch) | |
tree | b041f7a3e73cb99b6fd74ca4cafec3074dc98bca /components/script | |
parent | cbac5d05be13888fa78fcb4678f1620860b80228 (diff) | |
download | servo-e7631cea61b870db37d6b609e516ec64dd254849.tar.gz servo-e7631cea61b870db37d6b609e516ec64dd254849.zip |
Move ANGLE name shenanigans to WebGL thread
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/dom/webglprogram.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webglprogram.rs index e2a6f8fcf8d..f0d86b4bc69 100644 --- a/components/script/dom/webglprogram.rs +++ b/components/script/dom/webglprogram.rs @@ -3,8 +3,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl -use canvas_traits::webgl::{ActiveAttribInfo, ActiveUniformInfo, WebGLCommand, WebGLError, WebGLMsgSender}; -use canvas_traits::webgl::{WebGLProgramId, WebGLResult, to_name_in_compiled_shader, webgl_channel}; +use canvas_traits::webgl::{ActiveAttribInfo, ActiveUniformInfo, WebGLCommand, WebGLError}; +use canvas_traits::webgl::{WebGLMsgSender, WebGLProgramId, WebGLResult, webgl_channel}; use dom::bindings::cell::DomRefCell; use dom::bindings::codegen::Bindings::WebGLProgramBinding; use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants; @@ -248,10 +248,8 @@ impl WebGLProgram { return Err(WebGLError::InvalidOperation); } - let name = to_name_in_compiled_shader(&name); - self.renderer - .send(WebGLCommand::BindAttribLocation(self.id, index, name)) + .send(WebGLCommand::BindAttribLocation(self.id, index, name.into())) .unwrap(); Ok(()) } @@ -326,11 +324,9 @@ impl WebGLProgram { return Ok(None); } - let name = to_name_in_compiled_shader(&name); - let (sender, receiver) = webgl_channel().unwrap(); self.renderer - .send(WebGLCommand::GetUniformLocation(self.id, name, sender)) + .send(WebGLCommand::GetUniformLocation(self.id, name.into(), sender)) .unwrap(); Ok(receiver.recv().unwrap()) } |