From d859361a37dbbf737a2b2a3ad1145ab506dc469e Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sun, 30 May 2021 13:41:29 +0200 Subject: [PATCH] [dxgi] Add format mapping for DXGI_FORMAT_YUY2 And fix some existing 422 mappings. --- src/dxgi/dxgi_format.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/dxgi/dxgi_format.cpp b/src/dxgi/dxgi_format.cpp index 56506d10..b11cbca4 100644 --- a/src/dxgi/dxgi_format.cpp +++ b/src/dxgi/dxgi_format.cpp @@ -331,19 +331,15 @@ namespace dxvk { VK_FORMAT_UNDEFINED, VK_IMAGE_ASPECT_COLOR_BIT }, // DXGI_FORMAT_R8G8_B8G8_UNORM - { VK_FORMAT_B8G8R8G8_422_UNORM_KHR, + { VK_FORMAT_B8G8R8G8_422_UNORM, VK_FORMAT_UNDEFINED, VK_FORMAT_UNDEFINED, - VK_IMAGE_ASPECT_COLOR_BIT, 0, - { VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_G, - VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_ONE }}, + VK_IMAGE_ASPECT_COLOR_BIT }, // DXGI_FORMAT_G8R8_G8B8_UNORM - { VK_FORMAT_G8B8G8R8_422_UNORM_KHR, + { VK_FORMAT_G8B8G8R8_422_UNORM, VK_FORMAT_UNDEFINED, VK_FORMAT_UNDEFINED, - VK_IMAGE_ASPECT_COLOR_BIT, 0, - { VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_G, - VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_ONE }}, + VK_IMAGE_ASPECT_COLOR_BIT }, // DXGI_FORMAT_BC1_TYPELESS { VK_FORMAT_BC1_RGBA_UNORM_BLOCK, VK_FORMAT_UNDEFINED, @@ -508,7 +504,10 @@ namespace dxvk { VK_FORMAT_UNDEFINED, VK_IMAGE_ASPECT_PLANE_0_BIT | VK_IMAGE_ASPECT_PLANE_1_BIT }, // DXGI_FORMAT_YUY2 - { }, // Unsupported + { VK_FORMAT_G8B8G8R8_422_UNORM, + VK_FORMAT_UNDEFINED, + VK_FORMAT_UNDEFINED, + VK_IMAGE_ASPECT_COLOR_BIT }, // DXGI_FORMAT_Y210 { }, // Unsupported // DXGI_FORMAT_Y216 @@ -813,7 +812,9 @@ namespace dxvk { VK_FORMAT_R8_UINT, VK_FORMAT_R8G8_UINT }, // DXGI_FORMAT_YUY2 - { }, // Unsupported + { VK_FORMAT_G8B8G8R8_422_UNORM, + VK_FORMAT_R8G8B8A8_UNORM, + VK_FORMAT_R8G8B8A8_UINT }, // DXGI_FORMAT_Y210 { }, // Unsupported // DXGI_FORMAT_Y216