Auto merge of #8788 - ecoal95:fix-webgl-texturing, r=jdm

webgl: Fix texturing

These two tiny changes were making WebGL textures not work.

It was not seen in our texturing test since it only used one texture,
we render to a texture by default, and that texture was bound to
`gl::TEXTURE_2D`.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8788)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-04 22:12:26 +05:30
commit 2cfcc26d9e
2 changed files with 5 additions and 2 deletions

View file

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