diff --git a/src/xenia/gpu/d3d12/render_target_cache.cc b/src/xenia/gpu/d3d12/render_target_cache.cc index 25bc86cd5..dbca6d7ba 100644 --- a/src/xenia/gpu/d3d12/render_target_cache.cc +++ b/src/xenia/gpu/d3d12/render_target_cache.cc @@ -1277,7 +1277,7 @@ bool RenderTargetCache::ResolveCopy(SharedMemory* shared_memory, break; case ColorRenderTargetFormat::k_2_10_10_10: case 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_AS_10_10_10_10: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16: root_constants.tile_sample_dest_info |= (10 << 19) | (20 << 24); break; @@ -1557,7 +1557,7 @@ bool RenderTargetCache::ResolveCopy(SharedMemory* shared_memory, case ColorRenderTargetFormat::k_2_10_10_10_FLOAT: case ColorRenderTargetFormat::k_16_16_16_16: case ColorRenderTargetFormat::k_16_16_16_16_FLOAT: - case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16: + case ColorRenderTargetFormat::k_2_10_10_10_AS_10_10_10_10: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16: swizzle = D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(2, 1, 0, 3); break; @@ -1973,7 +1973,7 @@ ColorRenderTargetFormat RenderTargetCache::GetBaseColorFormat( 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; @@ -1989,7 +1989,7 @@ DXGI_FORMAT RenderTargetCache::GetColorDXGIFormat( case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: return DXGI_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 DXGI_FORMAT_R10G10B10A2_UNORM; case ColorRenderTargetFormat::k_2_10_10_10_FLOAT: case ColorRenderTargetFormat::k_16_16_16_16_FLOAT: diff --git a/src/xenia/gpu/dxbc_shader_translator_om.cc b/src/xenia/gpu/dxbc_shader_translator_om.cc index 9549d9884..c30092f5a 100644 --- a/src/xenia/gpu/dxbc_shader_translator_om.cc +++ b/src/xenia/gpu/dxbc_shader_translator_om.cc @@ -42,7 +42,7 @@ uint32_t DxbcShaderTranslator::GetColorFormatRTFlags( // Unused kRTFlag_FormatUnusedR | kRTFlag_FormatUnusedG | kRTFlag_FormatUnusedB | kRTFlag_FormatUnusedA, - // k_2_10_10_10_AS_16_16_16_16 + // k_2_10_10_10_AS_10_10_10_10 kRTFlag_FormatFixed, // Unused. kRTFlag_FormatUnusedR | kRTFlag_FormatUnusedG | kRTFlag_FormatUnusedB | @@ -82,7 +82,7 @@ void DxbcShaderTranslator::SetColorFormatSystemConstants( color_store_scale = alpha_store_scale = 255.0f; break; 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: constants.edram_rt_pack_width_low[rt_index] = 10 | (10 << 8) | (10 << 16) | (2 << 24); constants.edram_rt_pack_offset_low[rt_index] =