From f902ed559e79ae24796ced71f2ad479f55fa7738 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= <jp_bruyere@hotmail.com>
Date: Sun, 19 Dec 2021 10:51:20 +0100
Subject: [PATCH] add func ptrs in device internal

---
 src/vkvg_device_internal.c | 13 ++++++++++---
 src/vkvg_device_internal.h | 37 ++++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/vkvg_device_internal.c b/src/vkvg_device_internal.c
index 86e3840..123e099 100644
--- a/src/vkvg_device_internal.c
+++ b/src/vkvg_device_internal.c
@@ -48,6 +48,10 @@ PFN_vkCmdSetScissor				CmdSetScissor;
 
 PFN_vkCmdPushConstants			CmdPushConstants;
 
+PFN_vkWaitForFences				WaitForFence;
+PFN_vkResetFences				ResetFence;
+PFN_vkResetCommandBuffer		ResetCommandBuffer;
+
 bool _try_get_phyinfo (VkhPhyInfo* phys, uint32_t phyCount, VkPhysicalDeviceType gpuType, VkhPhyInfo* phy) {
 	for (uint32_t i=0; i<phyCount; i++){
 		if (vkh_phyinfo_get_properties(phys[i]).deviceType == gpuType) {
@@ -275,13 +279,13 @@ void _setupPipelines(VkvgDevice dev)
 	VkVertexInputAttributeDescription vertexInputAttributs[3] = {
 		{0, 0, VK_FORMAT_R32G32_SFLOAT, 0},
 		{1, 0, VK_FORMAT_R8G8B8A8_UNORM, 8},
-		{2, 0, VK_FORMAT_R32G32B32_SFLOAT, 12}
+		//{2, 0, VK_FORMAT_R32G32B32_SFLOAT, 12}
 	};
 
 	VkPipelineVertexInputStateCreateInfo vertexInputState = { .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
 		.vertexBindingDescriptionCount = 1,
 		.pVertexBindingDescriptions = &vertexInputBinding,
-		.vertexAttributeDescriptionCount = 3,
+		.vertexAttributeDescriptionCount = 2,
 		.pVertexAttributeDescriptions = vertexInputAttributs };
 #ifdef VKVG_WIRED_DEBUG
 	VkShaderModule modVert, modFrag, modFragWired;
@@ -446,7 +450,10 @@ bool _init_function_pointers (VkvgDevice dev) {
 	CmdEndRenderPass		= GetVkProcAddress(dev->vkDev, dev->instance, vkCmdEndRenderPass);
 	CmdSetViewport			= GetVkProcAddress(dev->vkDev, dev->instance, vkCmdSetViewport);
 	CmdSetScissor			= GetVkProcAddress(dev->vkDev, dev->instance, vkCmdSetScissor);
-	CmdPushConstants		= GetVkProcAddress(dev->vkDev, dev->instance, vkCmdPushConstants);	
+	CmdPushConstants		= GetVkProcAddress(dev->vkDev, dev->instance, vkCmdPushConstants);
+	WaitForFence			= GetVkProcAddress(dev->vkDev, dev->instance, vkWaitForFences);
+	ResetFence				= 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 0cbc953..79d2188 100644
--- a/src/vkvg_device_internal.h
+++ b/src/vkvg_device_internal.h
@@ -30,23 +30,26 @@
 #define STENCIL_CLIP_BIT	0x2
 #define STENCIL_ALL_BIT		0x3
 
-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_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_vkWaitForFences				WaitForFence;
+extern PFN_vkResetFences				ResetFence;
+extern PFN_vkResetCommandBuffer			ResetCommandBuffer;
 
 typedef struct _vkvg_device_t{
 	VkDevice				vkDev;					/**< Vulkan Logical Device */
-- 
2.47.3