diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-04 22:12:26 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-04 22:12:26 +0530 |
| commit | 2cfcc26d9e5cc732a7594f0c0d96d4174c6b0a8a (patch) | |
| tree | 90777b0cae9f4d1961343cd127b270214c31cd2e /components/script/dom | |
| parent | b32128e299212065d298b19106b9b7db970c2f23 (diff) | |
| parent | f3bd1f787947132edce63aa5dffe238d59f9c01f (diff) | |
| download | servo-2cfcc26d9e5cc732a7594f0c0d96d4174c6b0a8a.tar.gz servo-2cfcc26d9e5cc732a7594f0c0d96d4174c6b0a8a.zip | |
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 -->
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/webgltexture.rs | 2 |
1 files changed, 1 insertions, 1 deletions
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(()) } |