mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start going through VKFUNC

Browse Source
This commit is contained in:
twinaphex 2016-02-29 16:47:21 +01:00
parent 6c9e8041c6
commit 3677144d18
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/common/vulkan_common.c
View File

@ -101,6 +101,9 @@ void vulkan_copy_staging_to_dynamic(vk_t *vk, VkCommandBuffer cmd,
struct vk_texture *staging) struct vk_texture *staging)
{ {
VkImageCopy region; VkImageCopy region;
struct vulkan_context_fp *vkcfp =
vk->context ? (struct vulkan_context_fp*)&vk->context->fp : NULL;
retro_assert(dynamic->type == VULKAN_TEXTURE_DYNAMIC); retro_assert(dynamic->type == VULKAN_TEXTURE_DYNAMIC);
retro_assert(staging->type == VULKAN_TEXTURE_STAGING); retro_assert(staging->type == VULKAN_TEXTURE_STAGING);
@ -126,7 +129,7 @@ void vulkan_copy_staging_to_dynamic(vk_t *vk, VkCommandBuffer cmd,
region.srcSubresource.layerCount = 1; region.srcSubresource.layerCount = 1;
region.dstSubresource = region.srcSubresource; region.dstSubresource = region.srcSubresource;
vk->context->fp.vkCmdCopyImage(vk->cmd, VKFUNC(vkCmdCopyImage)(vk->cmd,
staging->image, VK_IMAGE_LAYOUT_GENERAL, staging->image, VK_IMAGE_LAYOUT_GENERAL,
dynamic->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dynamic->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
1, &region); 1, &region);

4
gfx/common/vulkan_common.h
View File

@ -127,9 +127,11 @@ enum vulkan_wsi_type
VULKAN_WSI_XLIB VULKAN_WSI_XLIB
}; };
#define VKFUNC(sym) (vkcfp->sym)
typedef struct vulkan_context typedef struct vulkan_context
{ {
struct struct vulkan_context_fp
{ {
PFN_vkDestroyFence vkDestroyFence; PFN_vkDestroyFence vkDestroyFence;
PFN_vkCreateFence vkCreateFence; PFN_vkCreateFence vkCreateFence;