From b1765c68821d12a21cd304f7dffaa3bdc8f101e4 Mon Sep 17 00:00:00 2001 From: ecoal95 Date: Sun, 14 Jun 2015 22:55:50 +0200 Subject: webgl: Refactor implementation to move logic inside the DOM interfaces This improves the encapsulation and consistency in our WebGL implementation. Also allows to implement new methods such as `getShaderSource()`. It will also allow us to use `delete()` in the destructors of them (note that we will want to keep track of them from the context). --- components/script/dom/webglframebuffer.rs | 40 ++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 6 deletions(-) (limited to 'components/script/dom/webglframebuffer.rs') diff --git a/components/script/dom/webglframebuffer.rs b/components/script/dom/webglframebuffer.rs index f4bb4b2b043..cd23765dfff 100644 --- a/components/script/dom/webglframebuffer.rs +++ b/components/script/dom/webglframebuffer.rs @@ -9,31 +9,59 @@ use dom::bindings::js::Root; use dom::bindings::utils::reflect_dom_object; use dom::webglobject::WebGLObject; +use canvas_traits::{CanvasMsg, CanvasWebGLMsg}; +use std::sync::mpsc::{channel, Sender}; +use std::cell::Cell; + #[dom_struct] pub struct WebGLFramebuffer { webgl_object: WebGLObject, id: u32, + is_deleted: Cell, + renderer: Sender, } impl WebGLFramebuffer { - fn new_inherited(id: u32) -> WebGLFramebuffer { + fn new_inherited(renderer: Sender, id: u32) -> WebGLFramebuffer { WebGLFramebuffer { webgl_object: WebGLObject::new_inherited(), id: id, + is_deleted: Cell::new(false), + renderer: renderer, } } - pub fn new(global: GlobalRef, id: u32) -> Root { - reflect_dom_object(box WebGLFramebuffer::new_inherited(id), global, WebGLFramebufferBinding::Wrap) + pub fn maybe_new(global: GlobalRef, renderer: Sender) -> Option> { + let (sender, receiver) = channel(); + renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::CreateFramebuffer(sender))).unwrap(); + receiver.recv().unwrap() + .map(|fb_id| WebGLFramebuffer::new(global, renderer, *fb_id)) + } + + pub fn new(global: GlobalRef, renderer: Sender, id: u32) -> Root { + reflect_dom_object(box WebGLFramebuffer::new_inherited(renderer, id), global, WebGLFramebufferBinding::Wrap) } } pub trait WebGLFramebufferHelpers { - fn get_id(self) -> u32; + fn id(self) -> u32; + fn bind(self, target: u32); + fn delete(self); } -impl<'a> WebGLFramebufferHelpers for &'a WebGLFramebuffer { - fn get_id(self) -> u32 { +impl<'a> WebGLFramebufferHelpers for JSRef<'a, WebGLFramebuffer> { + fn id(self) -> u32 { self.id } + + fn bind(self, target: u32) { + self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BindFramebuffer(target, self.id))).unwrap(); + } + + fn delete(self) { + if !self.is_deleted.get() { + self.is_deleted.set(true); + self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::DeleteFramebuffer(self.id))).unwrap(); + } + } } -- cgit v1.2.3 From 42bd43a696939c3259284a01b8ef64aa13a9939c Mon Sep 17 00:00:00 2001 From: ecoal95 Date: Mon, 15 Jun 2015 00:22:15 +0200 Subject: webgl: Make bind* calls more spec-compliant --- components/script/dom/webglframebuffer.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'components/script/dom/webglframebuffer.rs') diff --git a/components/script/dom/webglframebuffer.rs b/components/script/dom/webglframebuffer.rs index cd23765dfff..bbf59529241 100644 --- a/components/script/dom/webglframebuffer.rs +++ b/components/script/dom/webglframebuffer.rs @@ -9,7 +9,7 @@ use dom::bindings::js::Root; use dom::bindings::utils::reflect_dom_object; use dom::webglobject::WebGLObject; -use canvas_traits::{CanvasMsg, CanvasWebGLMsg}; +use canvas_traits::{CanvasMsg, CanvasWebGLMsg, WebGLFramebufferBindingRequest}; use std::sync::mpsc::{channel, Sender}; use std::cell::Cell; @@ -49,13 +49,15 @@ pub trait WebGLFramebufferHelpers { fn delete(self); } -impl<'a> WebGLFramebufferHelpers for JSRef<'a, WebGLFramebuffer> { +impl<'a> WebGLFramebufferHelpers for &'a WebGLFramebuffer { fn id(self) -> u32 { self.id } fn bind(self, target: u32) { - self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BindFramebuffer(target, self.id))).unwrap(); + self.renderer.send( + CanvasMsg::WebGL( + CanvasWebGLMsg::BindFramebuffer(target, WebGLFramebufferBindingRequest::Explicit(self.id)))).unwrap(); } fn delete(self) { -- cgit v1.2.3 From 8438db89e151ed07b32a5b37fd4c4f903605c126 Mon Sep 17 00:00:00 2001 From: ecoal95 Date: Mon, 6 Jul 2015 22:56:42 +0200 Subject: address review comments --- components/script/dom/webglframebuffer.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'components/script/dom/webglframebuffer.rs') diff --git a/components/script/dom/webglframebuffer.rs b/components/script/dom/webglframebuffer.rs index bbf59529241..26773ca4b17 100644 --- a/components/script/dom/webglframebuffer.rs +++ b/components/script/dom/webglframebuffer.rs @@ -34,8 +34,9 @@ impl WebGLFramebuffer { pub fn maybe_new(global: GlobalRef, renderer: Sender) -> Option> { let (sender, receiver) = channel(); renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::CreateFramebuffer(sender))).unwrap(); - receiver.recv().unwrap() - .map(|fb_id| WebGLFramebuffer::new(global, renderer, *fb_id)) + + let result = receiver.recv().unwrap(); + result.map(|fb_id| WebGLFramebuffer::new(global, renderer, *fb_id)) } pub fn new(global: GlobalRef, renderer: Sender, id: u32) -> Root { @@ -55,9 +56,8 @@ impl<'a> WebGLFramebufferHelpers for &'a WebGLFramebuffer { } fn bind(self, target: u32) { - self.renderer.send( - CanvasMsg::WebGL( - CanvasWebGLMsg::BindFramebuffer(target, WebGLFramebufferBindingRequest::Explicit(self.id)))).unwrap(); + let cmd = CanvasWebGLMsg::BindFramebuffer(target, WebGLFramebufferBindingRequest::Explicit(self.id)); + self.renderer.send(CanvasMsg::WebGL(cmd)).unwrap(); } fn delete(self) { -- cgit v1.2.3