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

[Vulkan] Don't allocate textures if we don't know the format. 

DTX5A = ATI1
This commit is contained in:
DrChat 2017-12-23 21:02:33 -06:00
parent 1b038125a1
commit 8784daf6bc
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/gpu/vulkan/texture_cache.cc
View File

@ -106,7 +106,7 @@ static const TextureConfig texture_configs[64] = {
/* k_11_11_10_AS_16_16_16_16 */ {VK_FORMAT_B10G11R11_UFLOAT_PACK32}, // ? /* k_11_11_10_AS_16_16_16_16 */ {VK_FORMAT_B10G11R11_UFLOAT_PACK32}, // ?
/* k_32_32_32_FLOAT */ {VK_FORMAT_R32G32B32_SFLOAT}, /* k_32_32_32_FLOAT */ {VK_FORMAT_R32G32B32_SFLOAT},
/* k_DXT3A */ {VK_FORMAT_UNDEFINED}, /* k_DXT3A */ {VK_FORMAT_UNDEFINED},
/* k_DXT5A */ {VK_FORMAT_UNDEFINED}, /* k_DXT5A */ {VK_FORMAT_UNDEFINED}, // ATI1N
// http://fileadmin.cs.lth.se/cs/Personal/Michael_Doggett/talks/unc-xenos-doggett.pdf // http://fileadmin.cs.lth.se/cs/Personal/Michael_Doggett/talks/unc-xenos-doggett.pdf
/* k_CTX1 */ {VK_FORMAT_R8G8_UINT}, /* k_CTX1 */ {VK_FORMAT_R8G8_UINT},
@ -257,9 +257,8 @@ TextureCache::Texture* TextureCache::AllocateTexture(
assert_not_null(texture_info.format_info()); assert_not_null(texture_info.format_info());
auto& config = texture_configs[int(texture_info.format_info()->format)]; auto& config = texture_configs[int(texture_info.format_info()->format)];
VkFormat format = config.host_format != VK_FORMAT_UNDEFINED VkFormat format = config.host_format;
? config.host_format assert(format != VK_FORMAT_UNDEFINED);
: VK_FORMAT_R8G8B8A8_UNORM;
image_info.tiling = VK_IMAGE_TILING_OPTIMAL; image_info.tiling = VK_IMAGE_TILING_OPTIMAL;
image_info.usage = image_info.usage =