From 90b8f983d000abe5f3be75c95f4bfab4e2a3d36d Mon Sep 17 00:00:00 2001 From: gibbed Date: Tue, 8 Aug 2017 16:46:08 -0500 Subject: [PATCH] - Vulkan: DXT1_AS_16_16_16_16 should probably map to VK_FORMAT_BC1_RGBA_UNORM_BLOCK. - Vulkan: Added comments regarding CTX1 format. --- src/xenia/gpu/vulkan/texture_cache.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/xenia/gpu/vulkan/texture_cache.cc b/src/xenia/gpu/vulkan/texture_cache.cc index 3701df30a..fc0879b64 100644 --- a/src/xenia/gpu/vulkan/texture_cache.cc +++ b/src/xenia/gpu/vulkan/texture_cache.cc @@ -85,8 +85,9 @@ static const TextureConfig texture_configs[64] = { // http://fileadmin.cs.lth.se/cs/Personal/Michael_Doggett/talks/unc-xenos-doggett.pdf {TextureFormat::k_DXN, VK_FORMAT_BC5_UNORM_BLOCK}, // ? + {TextureFormat::k_8_8_8_8_AS_16_16_16_16, VK_FORMAT_R8G8B8A8_UNORM}, - {TextureFormat::k_DXT1_AS_16_16_16_16, VK_FORMAT_BC1_RGB_UNORM_BLOCK}, + {TextureFormat::k_DXT1_AS_16_16_16_16, VK_FORMAT_BC1_RGBA_UNORM_BLOCK}, {TextureFormat::k_DXT2_3_AS_16_16_16_16, VK_FORMAT_BC2_UNORM_BLOCK}, {TextureFormat::k_DXT4_5_AS_16_16_16_16, VK_FORMAT_BC3_UNORM_BLOCK}, {TextureFormat::k_2_10_10_10_AS_16_16_16_16, @@ -98,7 +99,10 @@ static const TextureConfig texture_configs[64] = { {TextureFormat::k_32_32_32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT}, {TextureFormat::k_DXT3A, VK_FORMAT_UNDEFINED}, {TextureFormat::k_DXT5A, VK_FORMAT_UNDEFINED}, + + // http://fileadmin.cs.lth.se/cs/Personal/Michael_Doggett/talks/unc-xenos-doggett.pdf {TextureFormat::k_CTX1, VK_FORMAT_R8G8_UINT}, + {TextureFormat::k_DXT3A_AS_1_1_1_1, VK_FORMAT_UNDEFINED}, {TextureFormat::kUnknown, VK_FORMAT_UNDEFINED}, {TextureFormat::kUnknown, VK_FORMAT_UNDEFINED}, @@ -826,6 +830,7 @@ bool TextureCache::ConvertTexture2D(uint8_t* dest, log2_bpp, input_row_offset) >> log2_bpp; + // http://fileadmin.cs.lth.se/cs/Personal/Michael_Doggett/talks/unc-xenos-doggett.pdf union { uint8_t data[8]; struct {