webgl: Move framebuffer initialization logic to WebGL thread.

1 files changed, 14 insertions, 8 deletions

diff --git a/components/script/dom/webglframebuffer.rs b/components/script/dom/webglframebuffer.rs
index 09a1cbea7cc..277b8b2fcba 100644
--- a/components/script/dom/webglframebuffer.rs
+++ b/components/script/dom/webglframebuffer.rs
@@ -34,10 +34,17 @@ enum WebGLFramebufferAttachment {
 impl WebGLFramebufferAttachment {
     fn needs_initialization(&self) -> bool {
         match *self {
-            WebGLFramebufferAttachment::Renderbuffer(_) => true,
+            WebGLFramebufferAttachment::Renderbuffer(ref r) => !r.is_initialized(),
             WebGLFramebufferAttachment::Texture { .. } => false,
         }
     }
+
+    fn mark_initialized(&self) {
+        match *self {
+            WebGLFramebufferAttachment::Renderbuffer(ref r) => r.mark_initialized(),
+            WebGLFramebufferAttachment::Texture { .. } => ()
+        }
+    }
 }
 
 #[derive(Clone, JSTraceable, MallocSizeOf)]
@@ -239,15 +246,14 @@ impl WebGLFramebuffer {
             ];
             let mut clear_bits = 0;
             for &(attachment, bits) in &attachments {
-                if attachment.borrow().as_ref().map_or(false, |att| att.needs_initialization()) {
-                    clear_bits |= bits;
+                if let Some(ref att) = *attachment.borrow() {
+                    if att.needs_initialization() {
+                        att.mark_initialized();
+                        clear_bits |= bits;
+                    }
                 }
             }
-            if clear_bits != 0 {
-                self.upcast::<WebGLObject>().context().send_command(
-                    WebGLCommand::Clear(clear_bits)
-                );
-            }
+            self.upcast::<WebGLObject>().context().initialize_framebuffer(clear_bits);
             self.is_initialized.set(true);
         }