From: Jean-Philippe Bruyère Date: Thu, 13 Aug 2020 13:42:44 +0000 (+0200) Subject: move vk func pointer impl in .c, set extern in header X-Git-Tag: v0.1-alpha~2 X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=4b47362837c51f0d60d0f7931a593f0b6b7c7ddb;p=jp%2Fvkvg.git move vk func pointer impl in .c, set extern in header --- diff --git a/src/vkvg_device_internal.c b/src/vkvg_device_internal.c index d8f307e..79a8ff2 100644 --- a/src/vkvg_device_internal.c +++ b/src/vkvg_device_internal.c @@ -28,6 +28,25 @@ uint8_t vkvg_log_level = VKVG_LOG_ERR; +PFN_vkCmdBindPipeline CmdBindPipeline; +PFN_vkCmdBindDescriptorSets CmdBindDescriptorSets; +PFN_vkCmdBindIndexBuffer CmdBindIndexBuffer; +PFN_vkCmdBindVertexBuffers CmdBindVertexBuffers; + +PFN_vkCmdDrawIndexed CmdDrawIndexed; +PFN_vkCmdDraw CmdDraw; + +PFN_vkCmdSetStencilCompareMask CmdSetStencilCompareMask; +PFN_vkCmdSetStencilReference CmdSetStencilReference; +PFN_vkCmdSetStencilWriteMask CmdSetStencilWriteMask; +PFN_vkCmdBeginRenderPass CmdBeginRenderPass; +PFN_vkCmdEndRenderPass CmdEndRenderPass; +PFN_vkCmdSetViewport CmdSetViewport; +PFN_vkCmdSetScissor CmdSetScissor; + +PFN_vkCmdPushConstants CmdPushConstants; +PFN_vkCmdPushDescriptorSetKHR CmdPushDescriptorSet; + void _flush_all_contexes (VkvgDevice dev){ VkvgContext next = dev->lastCtx; while (next != NULL){ diff --git a/src/vkvg_device_internal.h b/src/vkvg_device_internal.h index a6b1b3a..8bf653c 100644 --- a/src/vkvg_device_internal.h +++ b/src/vkvg_device_internal.h @@ -30,25 +30,24 @@ #define STENCIL_CLIP_BIT 0x2 #define STENCIL_ALL_BIT 0x3 -PFN_vkCmdBindPipeline CmdBindPipeline; -PFN_vkCmdBindDescriptorSets CmdBindDescriptorSets; -PFN_vkCmdBindIndexBuffer CmdBindIndexBuffer; -PFN_vkCmdBindVertexBuffers CmdBindVertexBuffers; - -PFN_vkCmdDrawIndexed CmdDrawIndexed; -PFN_vkCmdDraw CmdDraw; - -PFN_vkCmdSetStencilCompareMask CmdSetStencilCompareMask; -PFN_vkCmdSetStencilReference CmdSetStencilReference; -PFN_vkCmdSetStencilWriteMask CmdSetStencilWriteMask; -PFN_vkCmdBeginRenderPass CmdBeginRenderPass; -PFN_vkCmdEndRenderPass CmdEndRenderPass; -PFN_vkCmdSetViewport CmdSetViewport; -PFN_vkCmdSetScissor CmdSetScissor; - -PFN_vkCmdPushConstants CmdPushConstants; -PFN_vkCmdPushDescriptorSetKHR CmdPushDescriptorSet; - +extern PFN_vkCmdBindPipeline CmdBindPipeline; +extern PFN_vkCmdBindDescriptorSets CmdBindDescriptorSets; +extern PFN_vkCmdBindIndexBuffer CmdBindIndexBuffer; +extern PFN_vkCmdBindVertexBuffers CmdBindVertexBuffers; + +extern PFN_vkCmdDrawIndexed CmdDrawIndexed; +extern PFN_vkCmdDraw CmdDraw; + +extern PFN_vkCmdSetStencilCompareMask CmdSetStencilCompareMask; +extern PFN_vkCmdSetStencilReference CmdSetStencilReference; +extern PFN_vkCmdSetStencilWriteMask CmdSetStencilWriteMask; +extern PFN_vkCmdBeginRenderPass CmdBeginRenderPass; +extern PFN_vkCmdEndRenderPass CmdEndRenderPass; +extern PFN_vkCmdSetViewport CmdSetViewport; +extern PFN_vkCmdSetScissor CmdSetScissor; + +extern PFN_vkCmdPushConstants CmdPushConstants; +extern PFN_vkCmdPushDescriptorSetKHR CmdPushDescriptorSet; typedef struct _vkvg_device_t{ VkDevice vkDev; /**< Vulkan Logical Device */