fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Vulkan] Don't break k_2_10_10_10.

Browse Source
This commit is contained in:
gibbed
2018-05-19 16:37:05 -05:00
parent 5fafdb2e7a
commit 981590bc98
3 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/gpu/texture_info.h
View File

@@ -203,9 +203,9 @@ inline TextureFormat ColorRenderTargetToTextureFormat(
return TextureFormat::k_16_16_FLOAT; return TextureFormat::k_16_16_FLOAT;
case ColorRenderTargetFormat::k_16_16_16_16_FLOAT: case ColorRenderTargetFormat::k_16_16_16_16_FLOAT:
return TextureFormat::k_16_16_16_16_FLOAT; return TextureFormat::k_16_16_16_16_FLOAT;
case ColorRenderTargetFormat::k_2_10_10_10_unknown: case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16:
return TextureFormat::k_2_10_10_10; return TextureFormat::k_2_10_10_10_AS_16_16_16_16;
case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16:
return TextureFormat::k_2_10_10_10_FLOAT; return TextureFormat::k_2_10_10_10_FLOAT;
case ColorRenderTargetFormat::k_32_FLOAT: case ColorRenderTargetFormat::k_32_FLOAT:
return TextureFormat::k_32_FLOAT; return TextureFormat::k_32_FLOAT;

31
src/xenia/gpu/vulkan/render_cache.cc
View File

@@ -34,9 +34,10 @@ VkFormat ColorRenderTargetFormatToVkFormat(ColorRenderTargetFormat format) {
case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: case ColorRenderTargetFormat::k_8_8_8_8_GAMMA:
return VK_FORMAT_R8G8B8A8_UNORM; return VK_FORMAT_R8G8B8A8_UNORM;
case ColorRenderTargetFormat::k_2_10_10_10: 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:
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; return VK_FORMAT_R16G16B16A16_SFLOAT;
case ColorRenderTargetFormat::k_16_16: case ColorRenderTargetFormat::k_16_16:
return VK_FORMAT_R16G16_UNORM; return VK_FORMAT_R16G16_UNORM;
@@ -807,10 +808,9 @@ bool RenderCache::ParseConfiguration(RenderConfiguration* config) {
case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: case ColorRenderTargetFormat::k_8_8_8_8_GAMMA:
config->color[i].format = ColorRenderTargetFormat::k_8_8_8_8; config->color[i].format = ColorRenderTargetFormat::k_8_8_8_8;
break; break;
case ColorRenderTargetFormat::k_2_10_10_10:
case ColorRenderTargetFormat::k_2_10_10_10_FLOAT: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT:
case ColorRenderTargetFormat::k_2_10_10_10_unknown: case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16:
case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16:
config->color[i].format = config->color[i].format =
ColorRenderTargetFormat::k_16_16_16_16_FLOAT; ColorRenderTargetFormat::k_16_16_16_16_FLOAT;
break; break;
@@ -970,10 +970,9 @@ CachedTileView* RenderCache::FindTileView(uint32_t base, uint32_t pitch,
case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: case ColorRenderTargetFormat::k_8_8_8_8_GAMMA:
format = uint32_t(ColorRenderTargetFormat::k_8_8_8_8); format = uint32_t(ColorRenderTargetFormat::k_8_8_8_8);
break; break;
case ColorRenderTargetFormat::k_2_10_10_10:
case ColorRenderTargetFormat::k_2_10_10_10_FLOAT: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT:
case ColorRenderTargetFormat::k_2_10_10_10_unknown: case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16:
case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16:
format = uint32_t(ColorRenderTargetFormat::k_16_16_16_16_FLOAT); format = uint32_t(ColorRenderTargetFormat::k_16_16_16_16_FLOAT);
break; break;
default: default:
@@ -1219,11 +1218,9 @@ void RenderCache::BlitToImage(VkCommandBuffer command_buffer,
case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: case ColorRenderTargetFormat::k_8_8_8_8_GAMMA:
format = uint32_t(ColorRenderTargetFormat::k_8_8_8_8); format = uint32_t(ColorRenderTargetFormat::k_8_8_8_8);
break; break;
case ColorRenderTargetFormat::k_2_10_10_10_unknown: case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16:
format = uint32_t(ColorRenderTargetFormat::k_2_10_10_10); case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16:
break; format = uint32_t(ColorRenderTargetFormat::k_16_16_16_16_FLOAT);
case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown:
format = uint32_t(ColorRenderTargetFormat::k_2_10_10_10_FLOAT);
break; break;
default: default:
// Rest are OK // Rest are OK
@@ -1335,11 +1332,9 @@ void RenderCache::ClearEDRAMColor(VkCommandBuffer command_buffer,
case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: case ColorRenderTargetFormat::k_8_8_8_8_GAMMA:
format = ColorRenderTargetFormat::k_8_8_8_8; format = ColorRenderTargetFormat::k_8_8_8_8;
break; break;
case ColorRenderTargetFormat::k_2_10_10_10_unknown: case ColorRenderTargetFormat::k_2_10_10_10_AS_16_16_16_16:
format = ColorRenderTargetFormat::k_2_10_10_10; case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16:
break; format = ColorRenderTargetFormat::k_16_16_16_16_FLOAT;
case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown:
format = ColorRenderTargetFormat::k_2_10_10_10_FLOAT;
break; break;
default: default:
// Rest are OK // Rest are OK

4
src/xenia/gpu/xenos.h
View File

@@ -150,8 +150,8 @@ enum class ColorRenderTargetFormat : uint32_t {
k_16_16_16_16 = 5, k_16_16_16_16 = 5,
k_16_16_FLOAT = 6, k_16_16_FLOAT = 6,
k_16_16_16_16_FLOAT = 7, k_16_16_16_16_FLOAT = 7,
k_2_10_10_10_unknown = 10, k_2_10_10_10_AS_16_16_16_16 = 10,
k_2_10_10_10_FLOAT_unknown = 12, k_2_10_10_10_FLOAT_AS_16_16_16_16 = 12,
k_32_FLOAT = 14, k_32_FLOAT = 14,
k_32_32_FLOAT = 15, k_32_32_FLOAT = 15,
}; };