The Android develop view reads its frame back through memory (TD-1) because wgpu's Vulkan swapchain never pre-rotates, and a portrait window on this tablet's landscape panel then tears. The fix is a small patch to each of these two crates, and this commit is only the ground it lands on: both are byte-for-byte the crates.io sources the lockfile already resolved, so the commits that follow are the patch and nothing else. third_party/ is excluded from the workspace, or every path dependency under the root would become a member and `--workspace` would test and lint upstream code as ours. The README says how to carry the patches across a Slint or wgpu bump, which matters because a stale version here does not fail the build — cargo just warns and uses the unpatched crate.
189 lines
6.6 KiB
Rust
189 lines
6.6 KiB
Rust
// Copyright © SixtyFPS GmbH <info@slint.dev>
|
|
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
|
|
|
|
use ash::vk::Handle;
|
|
use skia_safe::gpu::vk;
|
|
|
|
use wgpu_28 as wgpu;
|
|
|
|
fn vk_format_and_color_type(
|
|
format: wgpu::TextureFormat,
|
|
) -> Option<(skia_safe::gpu::vk::Format, skia_safe::ColorType)> {
|
|
match format {
|
|
wgpu::TextureFormat::Rgba8Unorm => {
|
|
Some((skia_safe::gpu::vk::Format::R8G8B8A8_UNORM, skia_safe::ColorType::RGBA8888))
|
|
}
|
|
wgpu::TextureFormat::Rgba8UnormSrgb => {
|
|
Some((skia_safe::gpu::vk::Format::R8G8B8A8_SRGB, skia_safe::ColorType::SRGBA8888))
|
|
}
|
|
wgpu::TextureFormat::Bgra8Unorm => {
|
|
Some((skia_safe::gpu::vk::Format::B8G8R8A8_UNORM, skia_safe::ColorType::BGRA8888))
|
|
}
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
/// # Safety
|
|
/// `vk_image_raw` must be a valid Vulkan image handle for the lifetime of the returned Surface.
|
|
unsafe fn wrap_vulkan_texture(
|
|
width: i32,
|
|
height: i32,
|
|
gr_context: &mut skia_safe::gpu::DirectContext,
|
|
vk_image_raw: u64,
|
|
vk_format: skia_safe::gpu::vk::Format,
|
|
color_type: skia_safe::ColorType,
|
|
) -> Option<skia_safe::Surface> {
|
|
unsafe {
|
|
let texture_info = &skia_safe::gpu::vk::ImageInfo::new(
|
|
vk_image_raw as _,
|
|
skia_safe::gpu::vk::Alloc::default(),
|
|
skia_safe::gpu::vk::ImageTiling::OPTIMAL,
|
|
skia_safe::gpu::vk::ImageLayout::COLOR_ATTACHMENT_OPTIMAL,
|
|
vk_format,
|
|
1,
|
|
None,
|
|
None,
|
|
None,
|
|
None,
|
|
);
|
|
let backend_render_target =
|
|
skia_safe::gpu::backend_render_targets::make_vk((width, height), texture_info);
|
|
skia_safe::gpu::surfaces::wrap_backend_render_target(
|
|
gr_context,
|
|
&backend_render_target,
|
|
skia_safe::gpu::SurfaceOrigin::TopLeft,
|
|
color_type,
|
|
None,
|
|
None,
|
|
)
|
|
}
|
|
}
|
|
|
|
/// # Safety
|
|
/// The caller must ensure `texture` was created by a Vulkan-backed wgpu device and remains
|
|
/// valid for the lifetime of the returned `skia_safe::Surface`.
|
|
pub unsafe fn make_vulkan_surface(
|
|
gr_context: &mut skia_safe::gpu::DirectContext,
|
|
texture: &wgpu::Texture,
|
|
) -> Option<skia_safe::Surface> {
|
|
// SAFETY: texture is borrowed for the duration of this call; the Vulkan handle is copied
|
|
// into Skia's internal BackendRenderTarget via wrap_vulkan_texture.
|
|
unsafe {
|
|
let vulkan_texture = texture.as_hal::<wgpu::wgc::api::Vulkan>()?;
|
|
let vk_image_raw = vulkan_texture.raw_handle().as_raw();
|
|
let size = texture.size();
|
|
let (vk_format, color_type) = vk_format_and_color_type(texture.format())?;
|
|
wrap_vulkan_texture(
|
|
size.width as i32,
|
|
size.height as i32,
|
|
gr_context,
|
|
vk_image_raw,
|
|
vk_format,
|
|
color_type,
|
|
)
|
|
}
|
|
}
|
|
|
|
pub unsafe fn import_vulkan_texture(
|
|
canvas: &skia_safe::Canvas,
|
|
texture: wgpu::Texture,
|
|
) -> Option<skia_safe::Image> {
|
|
unsafe {
|
|
let vulkan_texture = texture.as_hal::<wgpu::wgc::api::Vulkan>();
|
|
|
|
let alloc = skia_safe::gpu::vk::Alloc::default();
|
|
|
|
let (vk_format, color_type) = match texture.format() {
|
|
wgpu::TextureFormat::Rgba8Unorm => {
|
|
(skia_safe::gpu::vk::Format::R8G8B8A8_UNORM, skia_safe::ColorType::RGBA8888)
|
|
}
|
|
wgpu::TextureFormat::Rgba8UnormSrgb => {
|
|
(skia_safe::gpu::vk::Format::R8G8B8A8_SRGB, skia_safe::ColorType::SRGBA8888)
|
|
}
|
|
wgpu::TextureFormat::Bgra8Unorm => {
|
|
(skia_safe::gpu::vk::Format::B8G8R8A8_UNORM, skia_safe::ColorType::BGRA8888)
|
|
}
|
|
_ => return None,
|
|
};
|
|
|
|
let texture_info = &skia_safe::gpu::vk::ImageInfo::new(
|
|
vulkan_texture.unwrap().raw_handle().as_raw() as _,
|
|
alloc,
|
|
skia_safe::gpu::vk::ImageTiling::OPTIMAL,
|
|
skia_safe::gpu::vk::ImageLayout::COLOR_ATTACHMENT_OPTIMAL,
|
|
vk_format,
|
|
1,
|
|
None,
|
|
None,
|
|
None,
|
|
None,
|
|
);
|
|
|
|
let size = texture.size();
|
|
|
|
let backend_texture = skia_safe::gpu::backend_textures::make_vk(
|
|
(size.width as _, size.height as _),
|
|
texture_info,
|
|
"Borrowed Vulkan texture",
|
|
);
|
|
Some(
|
|
skia_safe::image::Image::from_texture(
|
|
canvas.recording_context().as_mut().unwrap(),
|
|
&backend_texture,
|
|
skia_safe::gpu::SurfaceOrigin::TopLeft,
|
|
color_type,
|
|
skia_safe::AlphaType::Unpremul,
|
|
None,
|
|
)
|
|
.unwrap(),
|
|
)
|
|
}
|
|
}
|
|
|
|
pub unsafe fn make_vulkan_context(
|
|
device: &wgpu::Device,
|
|
queue: &wgpu::Queue,
|
|
) -> Option<skia_safe::gpu::DirectContext> {
|
|
unsafe {
|
|
let vulkan_device = device.as_hal::<wgpu::wgc::api::Vulkan>()?;
|
|
let vulkan_queue = queue.as_hal::<wgpu::wgc::api::Vulkan>()?;
|
|
|
|
let vulkan_queue_raw = vulkan_queue.as_raw();
|
|
|
|
let get_proc = |of| {
|
|
let result = match of {
|
|
skia_safe::gpu::vk::GetProcOf::Instance(instance, name) => vulkan_device
|
|
.shared_instance()
|
|
.entry()
|
|
.get_instance_proc_addr(ash::vk::Instance::from_raw(instance as _), name),
|
|
skia_safe::gpu::vk::GetProcOf::Device(device, name) => vulkan_device
|
|
.shared_instance()
|
|
.raw_instance()
|
|
.get_device_proc_addr(ash::vk::Device::from_raw(device as _), name),
|
|
};
|
|
|
|
match result {
|
|
Some(f) => f as _,
|
|
None => {
|
|
//println!("resolve of {} failed", of.name().to_str().unwrap());
|
|
core::ptr::null()
|
|
}
|
|
}
|
|
};
|
|
|
|
// WGPU 28 is locked to vulkan 1.3 and skia assumes the highest vulkan API version of the
|
|
// physical device is chosen, causing it to ask for unsupported features/functions.
|
|
let backend = vk::BackendContext::new_builder(
|
|
vulkan_device.shared_instance().raw_instance().handle().as_raw() as _,
|
|
vulkan_device.raw_physical_device().as_raw() as _,
|
|
vulkan_device.raw_device().handle().as_raw() as _,
|
|
(vulkan_queue_raw.as_raw() as _, vulkan_device.queue_family_index() as _),
|
|
&get_proc,
|
|
Some(vk::Version::new(1, 3, 0)),
|
|
)
|
|
.build();
|
|
|
|
skia_safe::gpu::direct_contexts::make_vulkan(&backend, None)
|
|
}
|
|
}
|