eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-05-03 04:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move ANGLE name shenanigans to WebGL thread

Browse Source
This commit is contained in:
Anthony Ramine
2018-07-11 12:18:51 +02:00
parent cbac5d05be
commit e7631cea61
3 changed files with 50 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/script/dom/webglprogram.rs
View File

@@ -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())
}