From bdc1c01be5b2bd91aa11bd977defe3753a0da77e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Tue, 3 Apr 2018 04:14:20 +0200 Subject: [PATCH] use phy in device creation instead of memprops struct for easy .net integration --- include/vkvg.h | 3 +-- src/vkvg_device.c | 4 ++-- vkh | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/vkvg.h b/include/vkvg.h index da2a016..635b27d 100644 --- a/include/vkvg.h +++ b/include/vkvg.h @@ -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); diff --git a/src/vkvg_device.c b/src/vkvg_device.c index 1331b25..f0df8a6 100644 --- a/src/vkvg_device.c +++ b/src/vkvg_device.c @@ -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 a9a9ac9..cd9a5d1 160000 --- a/vkh +++ b/vkh @@ -1 +1 @@ -Subproject commit a9a9ac94d2a52465005278f4354b53559d216df4 +Subproject commit cd9a5d1cc4891788e4e9e52b170d539b077e9c1f -- 2.47.3