mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #23516 - pcwalton:webrenderup, r=pcwalton,jdm
Upgrade WebRender This is against an old Servo because I can't build current Servo due to compile errors in RNG crates. I verified that it starts up. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #23516 - [x] There are tests for these changes <!-- 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/23516) <!-- Reviewable:end -->
This commit is contained in:
commit
df73c71fb1
40 changed files with 496 additions and 443 deletions
|
@ -941,7 +941,7 @@ impl<'a> CanvasData<'a> {
|
|||
let size = self.drawtarget.get_size();
|
||||
|
||||
let descriptor = webrender_api::ImageDescriptor {
|
||||
size: webrender_api::DeviceIntSize::new(size.width, size.height),
|
||||
size: webrender_api::units::DeviceIntSize::new(size.width, size.height),
|
||||
stride: None,
|
||||
format: webrender_api::ImageFormat::BGRA8,
|
||||
offset: 0,
|
||||
|
|
|
@ -159,7 +159,7 @@ impl webrender::OutputImageHandler for OutputHandler {
|
|||
fn lock(
|
||||
&mut self,
|
||||
id: webrender_api::PipelineId,
|
||||
) -> Option<(u32, webrender_api::FramebufferIntSize)> {
|
||||
) -> Option<(u32, webrender_api::units::FramebufferIntSize)> {
|
||||
// Insert a fence in the WR command queue
|
||||
let gl_sync = self
|
||||
.webrender_gl
|
||||
|
@ -172,7 +172,7 @@ impl webrender::OutputImageHandler for OutputHandler {
|
|||
self.lock_channel.1.recv().unwrap().map(|(tex_id, size)| {
|
||||
(
|
||||
tex_id,
|
||||
webrender_api::FramebufferIntSize::new(size.width, size.height),
|
||||
webrender_api::units::FramebufferIntSize::new(size.width, size.height),
|
||||
)
|
||||
})
|
||||
}
|
||||
|
|
|
@ -659,7 +659,7 @@ impl<VR: WebVRRenderHandler + 'static> WebGLThread<VR> {
|
|||
/// Helper function to create a `webrender_api::ImageDescriptor`.
|
||||
fn image_descriptor(size: Size2D<i32>, alpha: bool) -> webrender_api::ImageDescriptor {
|
||||
webrender_api::ImageDescriptor {
|
||||
size: webrender_api::DeviceIntSize::new(size.width, size.height),
|
||||
size: webrender_api::units::DeviceIntSize::new(size.width, size.height),
|
||||
stride: None,
|
||||
format: webrender_api::ImageFormat::BGRA8,
|
||||
offset: 0,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue