Auto merge of #14145 - glennw:update-wr-remove-shaders, r=pcwalton

Update WR - stride support, remove deprecated / unused shaders.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14145)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-11-09 04:50:45 -06:00 committed by GitHub
commit 99f1257210
16 changed files with 16 additions and 799 deletions

View file

@ -323,7 +323,11 @@ fn get_placeholder_image(webrender_api: &webrender_traits::RenderApi) -> io::Res
let format = convert_format(image.format);
let mut bytes = Vec::new();
bytes.extend_from_slice(&*image.bytes);
image.id = Some(webrender_api.add_image(image.width, image.height, format, bytes));
image.id = Some(webrender_api.add_image(image.width,
image.height,
None,
format,
bytes));
Ok(Arc::new(image))
}
@ -478,7 +482,11 @@ impl ImageCache {
let format = convert_format(image.format);
let mut bytes = Vec::new();
bytes.extend_from_slice(&*image.bytes);
image.id = Some(self.webrender_api.add_image(image.width, image.height, format, bytes));
image.id = Some(self.webrender_api.add_image(image.width,
image.height,
None,
format,
bytes));
}
LoadResult::PlaceholderLoaded(..) | LoadResult::None => {}
}