From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Mon, 4 May 2020 21:34:47 +0000 (+0200)
Subject: create separate callable vkh_device_init_debug_utils
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=1fcee8223df65d87742bfe5ec36562bfaccecc11;p=jp%2Fvkhelpers.git

create separate callable vkh_device_init_debug_utils
---

diff --git a/include/vkh.h b/include/vkh.h
index a9a9242..3e4f2e8 100644
--- a/include/vkh.h
+++ b/include/vkh.h
@@ -93,6 +93,7 @@ uint32_t                            vkh_phy_info_get_graphic_queue_index(VkhPhyI
 VkhDevice           vkh_device_create   (VkhApp app, VkhPhyInfo phyInfo, VkDeviceCreateInfo* pDevice_info);
 VkhDevice           vkh_device_import   (VkInstance inst, VkPhysicalDevice phy, VkDevice vkDev);
 void                vkh_device_destroy  (VkhDevice dev);
+void                vkh_device_init_debug_utils (VkhDevice dev);
 
 void vkh_device_set_object_name (VkhDevice dev, VkObjectType objectType, uint64_t handle, const char *name);
 
diff --git a/src/vkh_device.c b/src/vkh_device.c
index c37e878..adcfe7b 100644
--- a/src/vkh_device.c
+++ b/src/vkh_device.c
@@ -51,18 +51,19 @@ VkhDevice vkh_device_import (VkInstance inst, VkPhysicalDevice phy, VkDevice vkD
     };
     vmaCreateAllocator(&allocatorInfo, &dev->allocator);
 
+    return dev;
+}
+/**
+ * @brief get instance proc addresses for debug utils (name, label,...)
+ * @param vkh device
+ */
+void vkh_device_init_debug_utils (VkhDevice dev) {
     SetDebugUtilsObjectNameEXT  = (PFN_vkSetDebugUtilsObjectNameEXT)vkGetInstanceProcAddr(dev->instance, "vkSetDebugUtilsObjectNameEXT");
     QueueBeginDebugUtilsLabelEXT  = (PFN_vkQueueBeginDebugUtilsLabelEXT)vkGetInstanceProcAddr(dev->instance, "vkQueueBeginDebugUtilsLabelEXT");
     QueueEndDebugUtilsLabelEXT  = (PFN_vkQueueEndDebugUtilsLabelEXT)vkGetInstanceProcAddr(dev->instance, "vkQueueEndDebugUtilsLabelEXT");
     CmdBeginDebugUtilsLabelEXT  = (PFN_vkCmdBeginDebugUtilsLabelEXT)vkGetInstanceProcAddr(dev->instance, "vkCmdBeginDebugUtilsLabelEXT");
     CmdEndDebugUtilsLabelEXT  = (PFN_vkCmdEndDebugUtilsLabelEXT)vkGetInstanceProcAddr(dev->instance, "vkCmdEndDebugUtilsLabelEXT");
     CmdInsertDebugUtilsLabelEXT  = (PFN_vkCmdInsertDebugUtilsLabelEXT)vkGetInstanceProcAddr(dev->instance, "vkCmdInsertDebugUtilsLabelEXT");
-
-    return dev;
-}
-
-void vkh_device_destroy_sampler (VkhDevice dev, VkSampler sampler) {
-    vkDestroySampler (dev->dev, sampler,NULL);
 }
 VkSampler vkh_device_create_sampler (VkhDevice dev, VkFilter magFilter, VkFilter minFilter,
                                VkSamplerMipmapMode mipmapMode, VkSamplerAddressMode addressMode){
@@ -78,6 +79,9 @@ VkSampler vkh_device_create_sampler (VkhDevice dev, VkFilter magFilter, VkFilter
     VK_CHECK_RESULT(vkCreateSampler(dev->dev, &samplerCreateInfo, NULL, &sampler));
     return sampler;
 }
+void vkh_device_destroy_sampler (VkhDevice dev, VkSampler sampler) {
+    vkDestroySampler (dev->dev, sampler, NULL);
+}
 void vkh_device_destroy (VkhDevice dev) {
     vmaDestroyAllocator (dev->allocator);
     vkDestroyDevice (dev->dev, NULL);