mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Vulkan] Fix regression with RGB565 and OriginalHistory. (#14968)

Browse Source 
Need to let filter chain know that we remapped the format.
Otherwise we end up trying to copy RGBA8888 to RGB565.
This commit is contained in:
Hans-Kristian Arntzen 2023-02-12 18:10:07 +01:00 committed by GitHub
parent 139f27c8a1
commit 89d2d66e98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/common/vulkan_common.c
View File

@ -456,7 +456,7 @@ struct vk_texture vulkan_create_texture(vk_t *vk,
* Use compute shader uploads instead.
* If we attempt to use streamed texture, force staging path.
* If we're creating fallback dynamic texture, force RGBA8888. */
if (format == VK_FORMAT_R5G6B5_UNORM_PACK16)
if (vulkan_remap_to_texture_format(format) != format)
{
if (type == VULKAN_TEXTURE_STREAMED)
{
@ -464,7 +464,7 @@ struct vk_texture vulkan_create_texture(vk_t *vk,
}
else if (type == VULKAN_TEXTURE_DYNAMIC)
{
format = VK_FORMAT_R8G8B8A8_UNORM;
format = vulkan_remap_to_texture_format(format);
info.format = format;
info.usage |= VK_IMAGE_USAGE_STORAGE_BIT;
}
@ -3360,7 +3360,8 @@ void vulkan_copy_staging_to_dynamic(vk_t *vk, VkCommandBuffer cmd,
VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
/* staging->format is always RGB565 here. Can be expanded as needed. */
/* staging->format is always RGB565 here.
* Can be expanded as needed if more cases are added to vulkan_remap_to_texture_format. */
retro_assert(staging->format == VK_FORMAT_R5G6B5_UNORM_PACK16);
set = vulkan_descriptor_manager_alloc(

8
gfx/common/vulkan_common.h
View File

@ -745,6 +745,14 @@ void vulkan_set_uniform_buffer(
void vulkan_debug_mark_image(VkDevice device, VkImage image);
void vulkan_debug_mark_memory(VkDevice device, VkDeviceMemory memory);
static inline VkFormat vulkan_remap_to_texture_format(VkFormat fmt)
{
if (fmt == VK_FORMAT_R5G6B5_UNORM_PACK16)
return VK_FORMAT_R8G8B8A8_UNORM;
else
return fmt;
}
RETRO_END_DECLS
#endif

4
gfx/drivers/vulkan.c
View File

@ -935,7 +935,7 @@ static bool vulkan_init_default_filter_chain(vk_t *vk)
info.queue = vk->context->queue;
info.command_pool = vk->swapchain[vk->context->current_frame_index].cmd_pool;
info.num_passes = 0;
info.original_format = vk->tex_fmt;
info.original_format = vulkan_remap_to_texture_format(vk->tex_fmt);
info.max_input_size.width = vk->tex_w;
info.max_input_size.height = vk->tex_h;
info.swapchain.viewport = vk->vk_vp;
@ -1007,7 +1007,7 @@ static bool vulkan_init_filter_chain_preset(vk_t *vk, const char *shader_path)
info.queue = vk->context->queue;
info.command_pool = vk->swapchain[vk->context->current_frame_index].cmd_pool;
info.num_passes = 0;
info.original_format = vk->tex_fmt;
info.original_format = vulkan_remap_to_texture_format(vk->tex_fmt);
info.max_input_size.width = vk->tex_w;
info.max_input_size.height = vk->tex_h;
info.swapchain.viewport = vk->vk_vp;