@@ -318,10 +318,12 @@ namespace dxvk {
318318 VK_FORMAT_R8_UINT ,
319319 VK_IMAGE_ASPECT_COLOR_BIT },
320320 // DXGI_FORMAT_A8_UNORM
321- { VK_FORMAT_A8_UNORM_KHR ,
321+ { VK_FORMAT_R8_UNORM ,
322322 VK_FORMAT_UNDEFINED ,
323- VK_FORMAT_R8_UINT ,
324- VK_IMAGE_ASPECT_COLOR_BIT , 0 },
323+ VK_FORMAT_UNDEFINED ,
324+ VK_IMAGE_ASPECT_COLOR_BIT , 0 ,
325+ { VK_COMPONENT_SWIZZLE_ZERO , VK_COMPONENT_SWIZZLE_ZERO ,
326+ VK_COMPONENT_SWIZZLE_ZERO , VK_COMPONENT_SWIZZLE_R }},
325327 // DXGI_FORMAT_R1_UNORM
326328 { }, // Unsupported
327329 // DXGI_FORMAT_R9G9B9E5_SHAREDEXP
@@ -858,16 +860,6 @@ namespace dxvk {
858860 RemapDepthFormat (DXGI_FORMAT_X24_TYPELESS_G8_UINT , VK_FORMAT_D32_SFLOAT_S8_UINT );
859861 RemapDepthFormat (DXGI_FORMAT_D24_UNORM_S8_UINT , VK_FORMAT_D32_SFLOAT_S8_UINT );
860862 }
861-
862- // Map A8_UNORM to R8_UNORM with appropriate swizzles if necessary
863- if (!CheckImageFormatSupport (device, VK_FORMAT_A8_UNORM_KHR ,
864- VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT |
865- VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT |
866- VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT )) {
867- RemapColorFormat (DXGI_FORMAT_A8_UNORM , VK_FORMAT_R8_UNORM ,
868- { VK_COMPONENT_SWIZZLE_ZERO , VK_COMPONENT_SWIZZLE_ZERO ,
869- VK_COMPONENT_SWIZZLE_ZERO , VK_COMPONENT_SWIZZLE_R });
870- }
871863 }
872864
873865
0 commit comments