From 7df45bf590df526b4c30ceb7d2773a06544695b9 Mon Sep 17 00:00:00 2001 From: gibbed Date: Sat, 26 May 2018 08:25:25 -0500 Subject: [PATCH] [Vulkan] Fix DXT3A conversion. --- src/xenia/gpu/texture_conversion.cc | 6 +++--- src/xenia/gpu/texture_info.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/xenia/gpu/texture_conversion.cc b/src/xenia/gpu/texture_conversion.cc index 81bd6b955..836ddd327 100644 --- a/src/xenia/gpu/texture_conversion.cc +++ b/src/xenia/gpu/texture_conversion.cc @@ -81,10 +81,10 @@ void ConvertTexelCTX1ToR8G8(Endian endian, void* output, const void* input, void ConvertTexelDXT3AToDXT3(Endian endian, void* output, const void* input, size_t length) { - const uint32_t bytes_per_block = 8; + const uint32_t bytes_per_block = 16; auto output_bytes = static_cast(output); - std::memset(&output_bytes[0], 0, 8); - CopySwapBlock(endian, &output_bytes[8], input, bytes_per_block); + CopySwapBlock(endian, &output_bytes[0], input, 8); + std::memset(&output_bytes[8], 0, 8); } // https://github.com/BinomialLLC/crunch/blob/ea9b8d8c00c8329791256adafa8cf11e4e7942a2/inc/crn_decomp.h#L4108 diff --git a/src/xenia/gpu/texture_info.h b/src/xenia/gpu/texture_info.h index 89ae085a3..62874fa7e 100644 --- a/src/xenia/gpu/texture_info.h +++ b/src/xenia/gpu/texture_info.h @@ -111,8 +111,6 @@ inline TextureFormat GetBaseFormat(TextureFormat texture_format) { return TextureFormat::k_10_11_11; case TextureFormat::k_11_11_10_AS_16_16_16_16: return TextureFormat::k_11_11_10; - case TextureFormat::k_DXT3A_AS_1_1_1_1: - return TextureFormat::k_DXT3A; default: break; }