mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes for Vulkan readback.

Browse Source 
We were getting weird and inconsistent viewport sizes back.
This commit is contained in:
Hans-Kristian Arntzen 2016-02-20 14:04:33 +01:00
parent bcac4a204f
commit fa449646e9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/drivers/vulkan.c
View File

@ -56,6 +56,7 @@ static void vulkan_set_viewport(void *data, unsigned viewport_width,
static void vulkan_overlay_free(vk_t *vk); static void vulkan_overlay_free(vk_t *vk);
static void vulkan_render_overlay(vk_t *vk); static void vulkan_render_overlay(vk_t *vk);
#endif #endif
static void vulkan_viewport_info(void *data, struct video_viewport *vp);
static const gfx_ctx_driver_t *vulkan_get_context(vk_t *vk) static const gfx_ctx_driver_t *vulkan_get_context(vk_t *vk)
{ {
@ -1170,15 +1171,18 @@ static void vulkan_readback(vk_t *vk)
{ {
VkImageCopy region; VkImageCopy region;
struct vk_texture *staging; struct vk_texture *staging;
struct video_viewport vp;
vulkan_viewport_info(vk, &vp);
memset(&region, 0, sizeof(region)); memset(&region, 0, sizeof(region));
region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
region.srcSubresource.layerCount = 1; region.srcSubresource.layerCount = 1;
region.dstSubresource = region.srcSubresource; region.dstSubresource = region.srcSubresource;
region.srcOffset.x = vk->vp.x;
region.srcOffset.y = vk->vp.y; region.srcOffset.x = vp.x;
region.extent.width = vk->vp.width; region.srcOffset.y = vp.y;
region.extent.height = vk->vp.height; region.extent.width = vp.width;
region.extent.height = vp.height;
region.extent.depth = 1; region.extent.depth = 1;
/* FIXME: We won't actually get format conversion with vkCmdCopyImage, so have to check /* FIXME: We won't actually get format conversion with vkCmdCopyImage, so have to check
@ -1718,6 +1722,10 @@ static void vulkan_viewport_info(void *data, struct video_viewport *vp)
unsigned width, height; unsigned width, height;
video_driver_get_size(&width, &height); video_driver_get_size(&width, &height);
/* Make sure we get the correct viewport. */
vulkan_set_viewport(vk, width, height, false, true);
*vp = vk->vp; *vp = vk->vp;
vp->full_width = width; vp->full_width = width;
vp->full_height = height; vp->full_height = height;