From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Sat, 27 Nov 2021 05:06:54 +0000 (+0100)
Subject: dev->getVkDev and phy, allow null handle to query queues
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=7dfff1a2e601e142583c122c9f716578d8e85039;p=jp%2Fvkhelpers.git

dev->getVkDev and phy, allow null handle to query queues
---

diff --git a/include/vkh.h b/include/vkh.h
index b47c18c..b559dbe 100644
--- a/include/vkh.h
+++ b/include/vkh.h
@@ -106,6 +106,8 @@ VkhDevice           vkh_device_create   (VkhApp app, VkhPhyInfo phyInfo, VkDevic
 VkhDevice           vkh_device_import   (VkInstance inst, VkPhysicalDevice phy, VkDevice vkDev);
 void                vkh_device_destroy  (VkhDevice dev);
 void                vkh_device_init_debug_utils (VkhDevice dev);
+VkDevice			vkh_device_get_vkdev(VkhDevice dev);
+VkPhysicalDevice	vkh_device_get_phy	(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 713be6a..606f312 100644
--- a/src/vkh_device.c
+++ b/src/vkh_device.c
@@ -53,6 +53,12 @@ VkhDevice vkh_device_import (VkInstance inst, VkPhysicalDevice phy, VkDevice vkD
 
 	return dev;
 }
+VkDevice vkh_device_get_vkdev (VkhDevice dev) {
+	return dev->dev;
+}
+VkPhysicalDevice vkh_device_get_phy (VkhDevice dev) {
+	return dev->phy;
+}
 /**
  * @brief get instance proc addresses for debug utils (name, label,...)
  * @param vkh device
diff --git a/src/vkh_phyinfo.c b/src/vkh_phyinfo.c
index d3dceb5..fe61099 100644
--- a/src/vkh_phyinfo.c
+++ b/src/vkh_phyinfo.c
@@ -103,10 +103,10 @@ VkPhysicalDeviceMemoryProperties vkh_phyinfo_get_memory_properties (VkhPhyInfo p
 }
 
 void vkh_phyinfo_get_queue_fam_indices (VkhPhyInfo phy, int* pQueue, int* gQueue, int* tQueue, int* cQueue) {
-	*pQueue = phy->pQueue;
-	*gQueue = phy->gQueue;
-	*tQueue = phy->tQueue;
-	*cQueue = phy->cQueue;
+	if (pQueue)	*pQueue = phy->pQueue;
+	if (gQueue)	*gQueue = phy->gQueue;
+	if (tQueue)	*tQueue = phy->tQueue;
+	if (cQueue)	*cQueue = phy->cQueue;
 }
 VkQueueFamilyProperties* vkh_phyinfo_get_queues_props(VkhPhyInfo phy, uint32_t* qCount) {
 	*qCount = phy->queueCount;