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

diff --git a/include/vkh.h b/include/vkh.h
index b47c18cd5b22b4fd3dc3f2aa10d273ae1c80ce73..b559dbe68d05be9c55d4a98c389df29148e1ac1f 100644 (file)
--- 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 713be6a11172a65849a7761f77dd41364226a57f..606f3122bdd41fa26ea4a128978a61ba55090e9b 100644 (file)
--- 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 d3dceb55fef0db9167e55f812166d99614e75517..fe61099f0656a7a1d19658ba93235e5ee21d774c 100644 (file)
--- 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;