mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 18:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rutabaga_gfx: match latest vulkano

Browse source 
- 'vulkano::device::DeviceExtensions::supported_by_device` deprecated
   * Use PhysicalDevice::supported_extensions instead

- formats now use VK naming convention, not Rust conventions

BUG=b:173630595
TEST=compile and run

Change-Id: Ibb1bdd8f98f9d6a5d38ac3605780a1ae8d818a6e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3203232
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Jason Macnak <natsu@google.com>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
This commit is contained in:
Gurchetan Singh 2021-10-04 11:01:30 -07:00 committed by Commit Bot
parent 74a548181c
commit 0bef14dd62
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
rutabaga_gfx/src/rutabaga_gralloc/formats.rs
View file

@ -144,20 +144,20 @@ impl DrmFormat {
/// Returns the Vulkan format from the DrmFormat.
pub fn vulkan_format(&self) -> RutabagaResult<VulkanFormat> {
match self.to_bytes() {
DRM_FORMAT_R8 => Ok(VulkanFormat::R8Unorm),
DRM_FORMAT_RGB565 => Ok(VulkanFormat::R5G6B5UnormPack16),
DRM_FORMAT_BGR888 => Ok(VulkanFormat::R8G8B8Unorm),
DRM_FORMAT_R8 => Ok(VulkanFormat::R8_UNORM),
DRM_FORMAT_RGB565 => Ok(VulkanFormat::R5G6B5_UNORM_PACK16),
DRM_FORMAT_BGR888 => Ok(VulkanFormat::R8G8B8_UNORM),
DRM_FORMAT_ABGR2101010 | DRM_FORMAT_XBGR2101010 => {
Ok(VulkanFormat::A2R10G10B10UnormPack32)
Ok(VulkanFormat::A2R10G10B10_UNORM_PACK32)
}
DRM_FORMAT_ABGR8888 | DRM_FORMAT_XBGR8888 => Ok(VulkanFormat::R8G8B8A8Unorm),
DRM_FORMAT_ABGR8888 | DRM_FORMAT_XBGR8888 => Ok(VulkanFormat::R8G8B8A8_UNORM),
DRM_FORMAT_ARGB2101010 | DRM_FORMAT_XRGB2101010 => {
Ok(VulkanFormat::A2B10G10R10UnormPack32)
Ok(VulkanFormat::A2B10G10R10_UNORM_PACK32)
}
DRM_FORMAT_ARGB8888 | DRM_FORMAT_XRGB8888 => Ok(VulkanFormat::B8G8R8A8Unorm),
DRM_FORMAT_ABGR16161616F => Ok(VulkanFormat::R16G16B16A16Sfloat),
DRM_FORMAT_NV12 => Ok(VulkanFormat::G8B8R8_2PLANE420Unorm),
DRM_FORMAT_YVU420 => Ok(VulkanFormat::G8B8R8_3PLANE420Unorm),
DRM_FORMAT_ARGB8888 | DRM_FORMAT_XRGB8888 => Ok(VulkanFormat::B8G8R8A8_UNORM),
DRM_FORMAT_ABGR16161616F => Ok(VulkanFormat::R16G16B16A16_SFLOAT),
DRM_FORMAT_NV12 => Ok(VulkanFormat::G8_B8R8_2PLANE_420_UNORM),
DRM_FORMAT_YVU420 => Ok(VulkanFormat::G8_B8_R8_3PLANE_420_UNORM),
_ => Err(RutabagaError::InvalidGrallocDrmFormat),
}
}

2
rutabaga_gfx/src/rutabaga_gralloc/vulkano_gralloc.rs
View file

@ -86,7 +86,7 @@ impl VulkanoGralloc {
"need graphics queue family to proceed",
))?;
let supported_extensions = DeviceExtensions::supported_by_device(physical);
let supported_extensions = physical.supported_extensions();
let desired_extensions = DeviceExtensions {
khr_dedicated_allocation: true,