aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webglshader.rs
diff options
context:
space:
mode:
authorMartin Robinson <mrobinson@igalia.com>2017-07-06 19:21:22 +0200
committerGlenn Watson <github@intuitionlibrary.com>2017-07-13 07:44:08 +1000
commite58e8ab42e832604cc71b01a25ca1e199323d7c6 (patch)
tree780698cde4d2f3400f75ce3cdac6c4b5bab18d50 /components/script/dom/webglshader.rs
parent4b6e79337ef975e3ec752513b76ae6a6284c1199 (diff)
downloadservo-e58e8ab42e832604cc71b01a25ca1e199323d7c6.tar.gz
servo-e58e8ab42e832604cc71b01a25ca1e199323d7c6.zip
Upgrade to the latest version of WebRender
Diffstat (limited to 'components/script/dom/webglshader.rs')
-rw-r--r--components/script/dom/webglshader.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/webglshader.rs b/components/script/dom/webglshader.rs
index b66151bf353..edd9cf7bdb3 100644
--- a/components/script/dom/webglshader.rs
+++ b/components/script/dom/webglshader.rs
@@ -16,8 +16,8 @@ use dom_struct::dom_struct;
use ipc_channel::ipc::IpcSender;
use std::cell::Cell;
use std::sync::{ONCE_INIT, Once};
-use webrender_traits;
-use webrender_traits::{WebGLCommand, WebGLParameter, WebGLResult, WebGLShaderId};
+use webrender_api;
+use webrender_api::{WebGLCommand, WebGLParameter, WebGLResult, WebGLShaderId};
#[derive(Clone, Copy, PartialEq, Debug, JSTraceable, HeapSizeOf)]
pub enum ShaderCompilationStatus {
@@ -71,7 +71,7 @@ impl WebGLShader {
renderer: IpcSender<CanvasMsg>,
shader_type: u32)
-> Option<Root<WebGLShader>> {
- let (sender, receiver) = webrender_traits::channel::msg_channel().unwrap();
+ let (sender, receiver) = webrender_api::channel::msg_channel().unwrap();
renderer.send(CanvasMsg::WebGL(WebGLCommand::CreateShader(shader_type, sender))).unwrap();
let result = receiver.recv().unwrap();
@@ -170,7 +170,7 @@ impl WebGLShader {
/// glGetParameter
pub fn parameter(&self, param_id: u32) -> WebGLResult<WebGLParameter> {
- let (sender, receiver) = webrender_traits::channel::msg_channel().unwrap();
+ let (sender, receiver) = webrender_api::channel::msg_channel().unwrap();
self.renderer.send(CanvasMsg::WebGL(WebGLCommand::GetShaderParameter(self.id, param_id, sender))).unwrap();
receiver.recv().unwrap()
}