ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into d3d12

This commit is contained in:
Triang3l 2018-12-29 14:55:17 +03:00
parent cbfc00f80e 54b211ed18
commit 616739048b
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,8 +230,10 @@ inline TextureFormat ColorRenderTargetToTextureFormat(
case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: case ColorRenderTargetFormat::k_8_8_8_8_GAMMA:
return TextureFormat::k_8_8_8_8_GAMMA_EDRAM; return TextureFormat::k_8_8_8_8_GAMMA_EDRAM;
case ColorRenderTargetFormat::k_2_10_10_10: 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; return TextureFormat::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_FLOAT_AS_16_16_16_16:
return TextureFormat::k_2_10_10_10_FLOAT_EDRAM; return TextureFormat::k_2_10_10_10_FLOAT_EDRAM;
case ColorRenderTargetFormat::k_16_16: case ColorRenderTargetFormat::k_16_16:
return TextureFormat::k_16_16_EDRAM; return TextureFormat::k_16_16_EDRAM;
@ -241,10 +243,6 @@ 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_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: case ColorRenderTargetFormat::k_32_FLOAT:
return TextureFormat::k_32_FLOAT; return TextureFormat::k_32_FLOAT;
case ColorRenderTargetFormat::k_32_32_FLOAT: case ColorRenderTargetFormat::k_32_32_FLOAT:

2
src/xenia/gpu/trace_viewer.cc
View File

@ -990,7 +990,7 @@ static const char* kColorFormatNames[] = {
/* 7 */ "k_16_16_16_16_FLOAT", /* 7 */ "k_16_16_16_16_FLOAT",
/* 8 */ "unknown(8)", /* 8 */ "unknown(8)",
/* 9 */ "unknown(9)", /* 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)", /* 11 */ "unknown(11)",
/* 12 */ "k_2_10_10_10_FLOAT_AS_16_16_16_16", /* 12 */ "k_2_10_10_10_FLOAT_AS_16_16_16_16",
/* 13 */ "unknown(13)", /* 13 */ "unknown(13)",

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

@ -32,7 +32,7 @@ ColorRenderTargetFormat GetBaseRTFormat(ColorRenderTargetFormat format) {
switch (format) { switch (format) {
case ColorRenderTargetFormat::k_8_8_8_8_GAMMA: case ColorRenderTargetFormat::k_8_8_8_8_GAMMA:
return ColorRenderTargetFormat::k_8_8_8_8; 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; return ColorRenderTargetFormat::k_2_10_10_10;
case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16:
return ColorRenderTargetFormat::k_2_10_10_10_FLOAT; return ColorRenderTargetFormat::k_2_10_10_10_FLOAT;
@ -47,7 +47,7 @@ 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_AS_16_16_16_16: case ColorRenderTargetFormat::k_2_10_10_10_AS_10_10_10_10:
return VK_FORMAT_A2R10G10B10_UNORM_PACK32; return VK_FORMAT_A2R10G10B10_UNORM_PACK32;
case ColorRenderTargetFormat::k_2_10_10_10_FLOAT: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT:
case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16: case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_AS_16_16_16_16:

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

@ -188,7 +188,7 @@ 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_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_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,