Auto merge of #19848 - glennw:update-wr-tcrt, r=jdm

Update WR (new capture API, render target cache optimization)

<!-- 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/19848)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-01-25 13:48:24 -06:00 committed by GitHub
commit e035f5a17f
2 changed files with 24 additions and 20 deletions

View file

@ -502,7 +502,9 @@ impl<VR: WebVRRenderHandler + 'static, OB: WebGLThreadObserver> WebGLThread<VR,
let data = webrender_api::ExternalImageData {
id: webrender_api::ExternalImageId(context_id.0 as u64),
channel_index: 0,
image_type: webrender_api::ExternalImageType::Texture2DHandle,
image_type: webrender_api::ExternalImageType::TextureHandle(
webrender_api::TextureTarget::Default,
),
};
webrender_api::ImageData::External(data)
}
@ -612,10 +614,12 @@ impl<T: WebGLExternalImageApi> webrender::ExternalImageHandler for WebGLExternal
let (texture_id, size) = self.handler.lock(ctx_id);
webrender::ExternalImage {
u0: 0.0,
u1: size.width as f32,
v1: 0.0,
v0: size.height as f32,
uv: webrender_api::TexelRect::new(
0.0,
size.height as f32,
size.width as f32,
0.0,
),
source: webrender::ExternalImageSource::NativeTexture(texture_id),
}