]> O.S.I.I.S - jp/vkvg.git/commitdiff
use phy in device creation instead of memprops struct for easy .net integration
authorJean-Philippe Bruyère <jp_bruyere@hotmail.com>
Tue, 3 Apr 2018 02:14:20 +0000 (04:14 +0200)
committerJean-Philippe Bruyère <jp_bruyere@hotmail.com>
Tue, 3 Apr 2018 02:14:20 +0000 (04:14 +0200)
include/vkvg.h
src/vkvg_device.c
vkh

index da2a016bcfb89e8314120c80502cd03ff0d08061..635b27dbc067f8e89afb331bce174dfe252e19c4 100644 (file)
@@ -16,8 +16,7 @@ typedef struct _vkvg_surface_t* VkvgSurface;
 typedef struct _vkvg_device_t*  VkvgDevice;
 typedef struct _vkvg_pattern_t* VkvgPattern;
 
-VkvgDevice     vkvg_device_create                      (VkDevice vkdev, VkQueue queue, uint32_t qFam,
-                                        VkPhysicalDeviceMemoryProperties memprops);
+VkvgDevice     vkvg_device_create                      (VkPhysicalDevice phy, VkDevice vkdev, VkQueue queue, uint32_t qFam);
 void           vkvg_device_destroy                     (VkvgDevice dev);
 
 VkvgSurface vkvg_surface_create                        (VkvgDevice dev, uint32_t width, uint32_t height);
index 1331b2583c07512ae197b816218094ca08f3c736..f0df8a6b4e6e3869a373ce283b0ac5080c09d740 100644 (file)
@@ -7,7 +7,7 @@ void _setupRenderPass           (VkvgDevice dev);
 void _setupPipelines            (VkvgDevice dev);
 void _createDescriptorSetLayout (VkvgDevice dev);
 
-VkvgDevice vkvg_device_create(VkDevice vkdev, VkQueue queue, uint32_t qFam, VkPhysicalDeviceMemoryProperties memprops)
+VkvgDevice vkvg_device_create(VkPhysicalDevice phy, VkDevice vkdev, VkQueue queue, uint32_t qFam)
 {
     VkvgDevice dev = (vkvg_device*)malloc(sizeof(vkvg_device));
 
@@ -15,7 +15,7 @@ VkvgDevice vkvg_device_create(VkDevice vkdev, VkQueue queue, uint32_t qFam, VkPh
     dev->vdpi = 96;
 
     dev->vkDev = vkdev;
-    dev->phyMemProps = memprops;
+    vkGetPhysicalDeviceMemoryProperties (phy, &dev->phyMemProps);
 
     dev->queue = queue;
     dev->qFam  = qFam;
diff --git a/vkh b/vkh
index a9a9ac94d2a52465005278f4354b53559d216df4..cd9a5d1cc4891788e4e9e52b170d539b077e9c1f 160000 (submodule)
--- a/vkh
+++ b/vkh
@@ -1 +1 @@
-Subproject commit a9a9ac94d2a52465005278f4354b53559d216df4
+Subproject commit cd9a5d1cc4891788e4e9e52b170d539b077e9c1f