diff --git a/src/xenia/gpu/texture_info.h b/src/xenia/gpu/texture_info.h index 03ab78fd9..c50fd0a8d 100644 --- a/src/xenia/gpu/texture_info.h +++ b/src/xenia/gpu/texture_info.h @@ -230,8 +230,10 @@ inline TextureFormat ColorRenderTargetToTextureFormat( case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: return TextureFormat::k_8_8_8_8_GAMMA_EDRAM; case ColorRenderTargetFormat::k_2_10_10_10: + case ColorRenderTargetFormat::k_2_10_10_10_AS_10_10_10_10: return TextureFormat::k_2_10_10_10; case ColorRenderTargetFormat::k_2_10_10_10_FLOAT: + case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16: return TextureFormat::k_2_10_10_10_FLOAT_EDRAM; case ColorRenderTargetFormat::k_16_16: return TextureFormat::k_16_16_EDRAM; @@ -241,10 +243,6 @@ inline TextureFormat ColorRenderTargetToTextureFormat( return TextureFormat::k_16_16_FLOAT; case ColorRenderTargetFormat::k_16_16_16_16_FLOAT: return TextureFormat::k_16_16_16_16_FLOAT; - case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16: - return TextureFormat::k_2_10_10_10_AS_16_16_16_16; - case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16: - return TextureFormat::k_2_10_10_10_FLOAT_EDRAM; case ColorRenderTargetFormat::k_32_FLOAT: return TextureFormat::k_32_FLOAT; case ColorRenderTargetFormat::k_32_32_FLOAT: diff --git a/src/xenia/gpu/trace_viewer.cc b/src/xenia/gpu/trace_viewer.cc index 5549e358c..1a3ccb951 100644 --- a/src/xenia/gpu/trace_viewer.cc +++ b/src/xenia/gpu/trace_viewer.cc @@ -990,7 +990,7 @@ static const char* kColorFormatNames[] = { /* 7 */ "k_16_16_16_16_FLOAT", /* 8 */ "unknown(8)", /* 9 */ "unknown(9)", - /* 10 */ "k_2_10_10_10_AS_16_16_16_16", + /* 10 */ "k_2_10_10_10_AS_10_10_10_10", /* 11 */ "unknown(11)", /* 12 */ "k_2_10_10_10_FLOAT_AS_16_16_16_16", /* 13 */ "unknown(13)", diff --git a/src/xenia/gpu/vulkan/render_cache.cc b/src/xenia/gpu/vulkan/render_cache.cc index 00df1eee8..075fd54ab 100644 --- a/src/xenia/gpu/vulkan/render_cache.cc +++ b/src/xenia/gpu/vulkan/render_cache.cc @@ -32,7 +32,7 @@ ColorRenderTargetFormat GetBaseRTFormat(ColorRenderTargetFormat format) { switch (format) { case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: return ColorRenderTargetFormat::k_8_8_8_8; - case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16: + case ColorRenderTargetFormat::k_2_10_10_10_AS_10_10_10_10: return ColorRenderTargetFormat::k_2_10_10_10; case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16: return ColorRenderTargetFormat::k_2_10_10_10_FLOAT; @@ -47,7 +47,7 @@ VkFormat ColorRenderTargetFormatToVkFormat(ColorRenderTargetFormat format) { case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: return VK_FORMAT_R8G8B8A8_UNORM; case ColorRenderTargetFormat::k_2_10_10_10: - case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16: + case ColorRenderTargetFormat::k_2_10_10_10_AS_10_10_10_10: return VK_FORMAT_A2R10G10B10_UNORM_PACK32; case ColorRenderTargetFormat::k_2_10_10_10_FLOAT: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16: diff --git a/src/xenia/gpu/xenos.h b/src/xenia/gpu/xenos.h index e1beab9e4..88c3177e8 100644 --- a/src/xenia/gpu/xenos.h +++ b/src/xenia/gpu/xenos.h @@ -188,7 +188,7 @@ enum class ColorRenderTargetFormat : uint32_t { k_16_16_16_16 = 5, k_16_16_FLOAT = 6, k_16_16_16_16_FLOAT = 7, - k_2_10_10_10_AS_16_16_16_16 = 10, + k_2_10_10_10_AS_10_10_10_10 = 10, k_2_10_10_10_FLOAT_AS_16_16_16_16 = 12, k_32_FLOAT = 14, k_32_32_FLOAT = 15,