libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-12 04:31:19 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

(Vulkan) Small cleanups

Browse Source
This commit is contained in:
libretroadmin 2023-02-21 21:19:27 +01:00
parent cc85d7fd6d
commit b442d6c9f8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/common/vulkan_common.c
View File

@ -420,7 +420,9 @@ struct vk_texture vulkan_create_texture(vk_t *vk,
enum vk_texture_type type)
{
unsigned i;
uint32_t buffer_width;
struct vk_texture tex;
VkFormat remap_tex_fmt;
VkMemoryRequirements mem_reqs;
VkSubresourceLayout layout;
VkDevice device = vk->context->device;
@ -432,7 +434,6 @@ struct vk_texture vulkan_create_texture(vk_t *vk,
VkCommandBufferAllocateInfo cmd_info = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO };
VkSubmitInfo submit_info = { VK_STRUCTURE_TYPE_SUBMIT_INFO };
VkCommandBufferBeginInfo begin_info = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
uint32_t buffer_width;
memset(&tex, 0, sizeof(tex));
@ -452,19 +453,19 @@ struct vk_texture vulkan_create_texture(vk_t *vk,
buffer_info.size = buffer_width * height;
buffer_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
remap_tex_fmt = vulkan_remap_to_texture_format(format);
/* Compatibility concern. Some Apple hardware does not support rgb565.
* 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 (vulkan_remap_to_texture_format(format) != format)
if (remap_tex_fmt != format)
{
if (type == VULKAN_TEXTURE_STREAMED)
{
type = VULKAN_TEXTURE_STAGING;
}
type = VULKAN_TEXTURE_STAGING;
else if (type == VULKAN_TEXTURE_DYNAMIC)
{
format = vulkan_remap_to_texture_format(format);
format = remap_tex_fmt;
info.format = format;
info.usage |= VK_IMAGE_USAGE_STORAGE_BIT;
}

7
gfx/common/vulkan_common.h
View File

@ -21,7 +21,7 @@
#endif
#include <lists/string_list.h>
#include <retro_inline.h>
#define VULKAN_DESCRIPTOR_MANAGER_BLOCK_SETS 16
#define VULKAN_MAX_DESCRIPTOR_POOL_SIZES 16
@ -745,12 +745,11 @@ 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)
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;
return fmt;
}
RETRO_END_DECLS