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

[Vulkan] Align texture extents in loading to vector size accessed by the shader 

Fixes loading of the 1x1 linear 8_8_8_8 texture containing just a single #FFFFFFFF texel in 4D5307E6, which is used for screen fade and the lobby map loading bar background
This commit is contained in:
Triang3l 2022-06-29 23:41:32 +03:00
parent 9392fff369
commit c0c3666e12
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/xenia/gpu/vulkan/vulkan_texture_cache.cc
View File

@ -1256,6 +1256,11 @@ bool VulkanTextureCache::LoadTextureDataFromResidentMemoryImpl(Texture& texture,
} }
// TODO(Triang3l): Use a single 512 MB shared memory binding if possible. // TODO(Triang3l): Use a single 512 MB shared memory binding if possible.
// TODO(Triang3l): Scaled resolve buffer bindings. // TODO(Triang3l): Scaled resolve buffer bindings.
// Aligning because if the data for a vector in a storage buffer is provided
// partially, the value read may still be (0, 0, 0, 0), and small (especially
// linear) textures won't be loaded correctly.
uint32_t source_length_alignment = UINT32_C(1)
<< load_shader_info.source_bpe_log2;
VkDescriptorSet descriptor_set_source_base = VK_NULL_HANDLE; VkDescriptorSet descriptor_set_source_base = VK_NULL_HANDLE;
VkDescriptorSet descriptor_set_source_mips = VK_NULL_HANDLE; VkDescriptorSet descriptor_set_source_mips = VK_NULL_HANDLE;
VkDescriptorBufferInfo write_descriptor_set_source_base_buffer_info; VkDescriptorBufferInfo write_descriptor_set_source_base_buffer_info;
@ -1273,7 +1278,7 @@ bool VulkanTextureCache::LoadTextureDataFromResidentMemoryImpl(Texture& texture,
write_descriptor_set_source_base_buffer_info.offset = texture_key.base_page write_descriptor_set_source_base_buffer_info.offset = texture_key.base_page
<< 12; << 12;
write_descriptor_set_source_base_buffer_info.range = write_descriptor_set_source_base_buffer_info.range =
vulkan_texture.GetGuestBaseSize(); xe::align(vulkan_texture.GetGuestBaseSize(), source_length_alignment);
VkWriteDescriptorSet& write_descriptor_set_source_base = VkWriteDescriptorSet& write_descriptor_set_source_base =
write_descriptor_sets[write_descriptor_set_count++]; write_descriptor_sets[write_descriptor_set_count++];
write_descriptor_set_source_base.sType = write_descriptor_set_source_base.sType =
@ -1303,7 +1308,7 @@ bool VulkanTextureCache::LoadTextureDataFromResidentMemoryImpl(Texture& texture,
write_descriptor_set_source_mips_buffer_info.offset = texture_key.mip_page write_descriptor_set_source_mips_buffer_info.offset = texture_key.mip_page
<< 12; << 12;
write_descriptor_set_source_mips_buffer_info.range = write_descriptor_set_source_mips_buffer_info.range =
vulkan_texture.GetGuestMipsSize(); xe::align(vulkan_texture.GetGuestMipsSize(), source_length_alignment);
VkWriteDescriptorSet& write_descriptor_set_source_mips = VkWriteDescriptorSet& write_descriptor_set_source_mips =
write_descriptor_sets[write_descriptor_set_count++]; write_descriptor_sets[write_descriptor_set_count++];
write_descriptor_set_source_mips.sType = write_descriptor_set_source_mips.sType =