aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <ecoal95@gmail.com>2015-12-03 02:53:37 +0100
committerEmilio Cobos Álvarez <ecoal95@gmail.com>2015-12-03 02:53:37 +0100
commit3af24ed119f8612b153daf443497ec767f687ef7 (patch)
tree768b2dcaf6feb3127fe645036ccd6b640cbf743a
parent2be60be062e14c937af601faed78a6aceccdb062 (diff)
downloadservo-3af24ed119f8612b153daf443497ec767f687ef7.tar.gz
servo-3af24ed119f8612b153daf443497ec767f687ef7.zip
webgl: Fix texturing
These two tiny changes were making WebGL textures not work. It was not seen in our texturing test since we render to a texture by default, and that texture was bound to `gl::TEXTURE_2D`.
-rw-r--r--components/canvas/webgl_paint_task.rs2
-rw-r--r--components/script/dom/webgltexture.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/components/canvas/webgl_paint_task.rs b/components/canvas/webgl_paint_task.rs
index 28fabacf72e..40247266472 100644
--- a/components/canvas/webgl_paint_task.rs
+++ b/components/canvas/webgl_paint_task.rs
@@ -257,7 +257,7 @@ impl WebGLPaintTask {
}
fn create_texture(&self, chan: IpcSender<Option<NonZero<u32>>>) {
- let texture = gl::gen_framebuffers(1)[0];
+ let texture = gl::gen_textures(1)[0];
let texture = if texture == 0 {
None
} else {
diff --git a/components/script/dom/webgltexture.rs b/components/script/dom/webgltexture.rs
index 2288c9be7f7..e7f645ce235 100644
--- a/components/script/dom/webgltexture.rs
+++ b/components/script/dom/webgltexture.rs
@@ -70,7 +70,7 @@ impl WebGLTexture {
self.target.set(Some(target));
}
- self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BindTexture(self.id, target))).unwrap();
+ self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BindTexture(target, self.id))).unwrap();
Ok(())
}