diff --git a/src/xenia/gpu/texture_info.h b/src/xenia/gpu/texture_info.h index 82bf79e4c..0b3fca75a 100644 --- a/src/xenia/gpu/texture_info.h +++ b/src/xenia/gpu/texture_info.h @@ -203,9 +203,9 @@ 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_unknown: - return TextureFormat::k_2_10_10_10; - case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown: + 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; case ColorRenderTargetFormat::k_32_FLOAT: return TextureFormat::k_32_FLOAT; diff --git a/src/xenia/gpu/vulkan/render_cache.cc b/src/xenia/gpu/vulkan/render_cache.cc index 311a64fd0..4e96a9b1d 100644 --- a/src/xenia/gpu/vulkan/render_cache.cc +++ b/src/xenia/gpu/vulkan/render_cache.cc @@ -34,9 +34,10 @@ 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_unknown: + return VK_FORMAT_A2R10G10B10_UNORM_PACK32; + case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT: - case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown: + case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16: return VK_FORMAT_R16G16B16A16_SFLOAT; case ColorRenderTargetFormat::k_16_16: return VK_FORMAT_R16G16_UNORM; @@ -807,10 +808,9 @@ bool RenderCache::ParseConfiguration(RenderConfiguration* config) { case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: config->color[i].format = ColorRenderTargetFormat::k_8_8_8_8; break; - case ColorRenderTargetFormat::k_2_10_10_10: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT: - case ColorRenderTargetFormat::k_2_10_10_10_unknown: - case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown: + case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16: + case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16: config->color[i].format = ColorRenderTargetFormat::k_16_16_16_16_FLOAT; break; @@ -970,10 +970,9 @@ CachedTileView* RenderCache::FindTileView(uint32_t base, uint32_t pitch, case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: format = uint32_t(ColorRenderTargetFormat::k_8_8_8_8); break; - case ColorRenderTargetFormat::k_2_10_10_10: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT: - case ColorRenderTargetFormat::k_2_10_10_10_unknown: - case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown: + case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16: + case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16: format = uint32_t(ColorRenderTargetFormat::k_16_16_16_16_FLOAT); break; default: @@ -1219,11 +1218,9 @@ void RenderCache::BlitToImage(VkCommandBuffer command_buffer, case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: format = uint32_t(ColorRenderTargetFormat::k_8_8_8_8); break; - case ColorRenderTargetFormat::k_2_10_10_10_unknown: - format = uint32_t(ColorRenderTargetFormat::k_2_10_10_10); - break; - case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown: - format = uint32_t(ColorRenderTargetFormat::k_2_10_10_10_FLOAT); + case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16: + case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16: + format = uint32_t(ColorRenderTargetFormat::k_16_16_16_16_FLOAT); break; default: // Rest are OK @@ -1335,11 +1332,9 @@ void RenderCache::ClearEDRAMColor(VkCommandBuffer command_buffer, case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: format = ColorRenderTargetFormat::k_8_8_8_8; break; - case ColorRenderTargetFormat::k_2_10_10_10_unknown: - format = ColorRenderTargetFormat::k_2_10_10_10; - break; - case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown: - format = ColorRenderTargetFormat::k_2_10_10_10_FLOAT; + case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16: + case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16: + format = ColorRenderTargetFormat::k_16_16_16_16_FLOAT; break; default: // Rest are OK diff --git a/src/xenia/gpu/xenos.h b/src/xenia/gpu/xenos.h index d6a24a856..682cf5669 100644 --- a/src/xenia/gpu/xenos.h +++ b/src/xenia/gpu/xenos.h @@ -150,8 +150,8 @@ 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_unknown = 10, - k_2_10_10_10_FLOAT_unknown = 12, + k_2_10_10_10_AS_16_16_16_16 = 10, + k_2_10_10_10_FLOAT_AS_16_16_16_16 = 12, k_32_FLOAT = 14, k_32_32_FLOAT = 15, };