From 1ec62e56ee93b9a722f6eaa23171d4dba8b48a8d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Sun, 19 Dec 2021 10:54:54 +0100 Subject: [PATCH] dev or inst pfn calls --- src/vkvg_context_internal.c | 6 +++--- src/vkvg_device_internal.c | 8 ++++---- src/vkvg_device_internal.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/vkvg_context_internal.c b/src/vkvg_context_internal.c index 1b0a468..84d044f 100644 --- a/src/vkvg_context_internal.c +++ b/src/vkvg_context_internal.c @@ -352,14 +352,14 @@ void _clear_attachment (VkvgContext ctx) { } bool _wait_flush_fence (VkvgContext ctx) { LOG(VKVG_LOG_INFO, "CTX: _wait_flush_fence\n"); - if (vkWaitForFences (ctx->pSurf->dev->vkDev, 1, &ctx->flushFence, VK_TRUE, VKVG_FENCE_TIMEOUT) == VK_SUCCESS) + if (WaitForFences (ctx->pSurf->dev->vkDev, 1, &ctx->flushFence, VK_TRUE, VKVG_FENCE_TIMEOUT) == VK_SUCCESS) return true; ctx->status = VKVG_STATUS_TIMEOUT; return false; } void _reset_flush_fence (VkvgContext ctx) { LOG(VKVG_LOG_INFO, "CTX: _reset_flush_fence\n"); - vkResetFences (ctx->pSurf->dev->vkDev, 1, &ctx->flushFence); + ResetFences (ctx->pSurf->dev->vkDev, 1, &ctx->flushFence); } bool _wait_and_submit_cmd (VkvgContext ctx){ if (!ctx->cmdStarted)//current cmd buff is empty, be aware that wait is also canceled!! @@ -378,7 +378,7 @@ bool _wait_and_submit_cmd (VkvgContext ctx){ else ctx->cmd = ctx->cmdBuffers[0]; - vkResetCommandBuffer (ctx->cmd, 0); + ResetCommandBuffer (ctx->cmd, 0); ctx->cmdStarted = false; return true; } diff --git a/src/vkvg_device_internal.c b/src/vkvg_device_internal.c index 123e099..5690050 100644 --- a/src/vkvg_device_internal.c +++ b/src/vkvg_device_internal.c @@ -48,8 +48,8 @@ PFN_vkCmdSetScissor CmdSetScissor; PFN_vkCmdPushConstants CmdPushConstants; -PFN_vkWaitForFences WaitForFence; -PFN_vkResetFences ResetFence; +PFN_vkWaitForFences WaitForFences; +PFN_vkResetFences ResetFences; PFN_vkResetCommandBuffer ResetCommandBuffer; bool _try_get_phyinfo (VkhPhyInfo* phys, uint32_t phyCount, VkPhysicalDeviceType gpuType, VkhPhyInfo* phy) { @@ -451,8 +451,8 @@ bool _init_function_pointers (VkvgDevice dev) { CmdSetViewport = GetVkProcAddress(dev->vkDev, dev->instance, vkCmdSetViewport); CmdSetScissor = GetVkProcAddress(dev->vkDev, dev->instance, vkCmdSetScissor); CmdPushConstants = GetVkProcAddress(dev->vkDev, dev->instance, vkCmdPushConstants); - WaitForFence = GetVkProcAddress(dev->vkDev, dev->instance, vkWaitForFences); - ResetFence = GetVkProcAddress(dev->vkDev, dev->instance, vkResetFences); + WaitForFences = GetVkProcAddress(dev->vkDev, dev->instance, vkWaitForFences); + ResetFences = GetVkProcAddress(dev->vkDev, dev->instance, vkResetFences); ResetCommandBuffer = GetVkProcAddress(dev->vkDev, dev->instance, vkResetCommandBuffer); return true; } diff --git a/src/vkvg_device_internal.h b/src/vkvg_device_internal.h index 79d2188..4e6653f 100644 --- a/src/vkvg_device_internal.h +++ b/src/vkvg_device_internal.h @@ -47,8 +47,8 @@ extern PFN_vkCmdSetViewport CmdSetViewport; extern PFN_vkCmdSetScissor CmdSetScissor; extern PFN_vkCmdPushConstants CmdPushConstants; -extern PFN_vkWaitForFences WaitForFence; -extern PFN_vkResetFences ResetFence; +extern PFN_vkWaitForFences WaitForFences; +extern PFN_vkResetFences ResetFences; extern PFN_vkResetCommandBuffer ResetCommandBuffer; typedef struct _vkvg_device_t{ -- 2.47.3