mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-26 06:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid using _PACK16 pixel formats on platforms without them (#14863)

Browse Source
This commit is contained in:
warmenhoven 2023-01-23 15:00:22 -05:00 committed by GitHub
parent 571e7cbd67
commit 5b4c2c3e12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/common/vulkan_common.c
View File

@ -3018,6 +3018,11 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
return false; return false;
} }
VkFormatProperties formatProperties;
vkGetPhysicalDeviceFormatProperties(vk->context.gpu, VK_FORMAT_R5G6B5_UNORM_PACK16, &formatProperties);
if (formatProperties.optimalTilingFeatures != 0)
vk->context.flags |= VK_CTX_FLAG_HAS_PACK16_FMTS;
#ifdef VULKAN_HDR_SWAPCHAIN #ifdef VULKAN_HDR_SWAPCHAIN
if (settings->bools.video_hdr_enable) if (settings->bools.video_hdr_enable)
vk->context.flags |= VK_CTX_FLAG_HDR_ENABLE; vk->context.flags |= VK_CTX_FLAG_HDR_ENABLE;

3
gfx/common/vulkan_common.h
View File

@ -118,7 +118,8 @@ enum vulkan_context_flags
/* Used by screenshot to get blits with correct colorspace. */ /* Used by screenshot to get blits with correct colorspace. */
VK_CTX_FLAG_SWAPCHAIN_IS_SRGB = (1 << 2), VK_CTX_FLAG_SWAPCHAIN_IS_SRGB = (1 << 2),
VK_CTX_FLAG_SWAP_INTERVAL_EMULATION_LOCK = (1 << 3), VK_CTX_FLAG_SWAP_INTERVAL_EMULATION_LOCK = (1 << 3),
VK_CTX_FLAG_HAS_ACQUIRED_SWAPCHAIN = (1 << 4) VK_CTX_FLAG_HAS_ACQUIRED_SWAPCHAIN = (1 << 4),
VK_CTX_FLAG_HAS_PACK16_FMTS = (1 << 5)
}; };
typedef struct vulkan_context typedef struct vulkan_context

34
gfx/drivers/vulkan.c
View File

@ -1476,8 +1476,11 @@ static void *vulkan_init(const video_info_t *video,
vk->flags &= ~VK_FLAG_FULLSCREEN; vk->flags &= ~VK_FLAG_FULLSCREEN;
vk->tex_w = RARCH_SCALE_BASE * video->input_scale; vk->tex_w = RARCH_SCALE_BASE * video->input_scale;
vk->tex_h = RARCH_SCALE_BASE * video->input_scale; vk->tex_h = RARCH_SCALE_BASE * video->input_scale;
vk->tex_fmt = video->rgb32 if (vk->context->flags & VK_CTX_FLAG_HAS_PACK16_FMTS)
? VK_FORMAT_B8G8R8A8_UNORM : VK_FORMAT_R5G6B5_UNORM_PACK16; vk->tex_fmt = video->rgb32
? VK_FORMAT_B8G8R8A8_UNORM : VK_FORMAT_R5G6B5_UNORM_PACK16;
else
vk->tex_fmt = VK_FORMAT_B8G8R8A8_UNORM;
if (video->force_aspect) if (video->force_aspect)
vk->flags |= VK_FLAG_KEEP_ASPECT; vk->flags |= VK_FLAG_KEEP_ASPECT;
else else
@ -2195,7 +2198,32 @@ static bool vulkan_frame(void *data, const void *frame,
NULL, NULL, VULKAN_TEXTURE_DYNAMIC); NULL, NULL, VULKAN_TEXTURE_DYNAMIC);
} }
if (frame != chain->texture.mapped) if (!vk->video.rgb32 && !(vk->context->flags & VK_CTX_FLAG_HAS_PACK16_FMTS))
{
uint16_t *rgb565_src = ((uint16_t*)frame) + (frame_height * pitch / 2/*bpp*/);
uint32_t *bgra8888_dst = ((uint32_t*)chain->texture.mapped) + (frame_height * chain->texture.stride / 4/*bpp*/);
uint16_t rgbpix;
uint32_t bgrapix;
unsigned x;
for (y = frame_height; y > 0; y--)
{
rgb565_src -= pitch / 2/*bpp*/;
bgra8888_dst -= chain->texture.stride / 4/*bpp*/;
for (x = frame_width; x > 0; )
{
x--;
rgbpix = rgb565_src[x];
bgrapix = 0xff00;
bgrapix |= (rgbpix & 0xf800) >> 8;
bgrapix <<= 8;
bgrapix |= (rgbpix & 0x07e0) >> 3;
bgrapix <<= 8;
bgrapix |= (rgbpix & 0x1f) << 3;
bgra8888_dst[x] = bgrapix;
}
}
}
else if (frame != chain->texture.mapped)
{ {
dst = (uint8_t*)chain->texture.mapped; dst = (uint8_t*)chain->texture.mapped;
if ( (chain->texture.stride == pitch ) if ( (chain->texture.stride == pitch )