From 0bef14dd62e8cab26cad49780570f382ad1f6f02 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 4 Oct 2021 11:01:30 -0700 Subject: [PATCH] rutabaga_gfx: match latest vulkano - '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 Commit-Queue: Gurchetan Singh Reviewed-by: Jason Macnak Reviewed-by: Dennis Kempin --- rutabaga_gfx/src/rutabaga_gralloc/formats.rs | 20 +++++++++---------- .../src/rutabaga_gralloc/vulkano_gralloc.rs | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rutabaga_gfx/src/rutabaga_gralloc/formats.rs b/rutabaga_gfx/src/rutabaga_gralloc/formats.rs index 6dd0ac60b5..8bb93f7e18 100644 --- a/rutabaga_gfx/src/rutabaga_gralloc/formats.rs +++ b/rutabaga_gfx/src/rutabaga_gralloc/formats.rs @@ -144,20 +144,20 @@ impl DrmFormat { /// Returns the Vulkan format from the DrmFormat. pub fn vulkan_format(&self) -> RutabagaResult { 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), } } diff --git a/rutabaga_gfx/src/rutabaga_gralloc/vulkano_gralloc.rs b/rutabaga_gfx/src/rutabaga_gralloc/vulkano_gralloc.rs index 00a432774a..fa3ccd74dd 100644 --- a/rutabaga_gfx/src/rutabaga_gralloc/vulkano_gralloc.rs +++ b/rutabaga_gfx/src/rutabaga_gralloc/vulkano_gralloc.rs @@ -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,