From 7249166d085a99b42a11f5d44c6f127de0bc6d1c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Sun, 28 Apr 2019 00:41:07 +0200 Subject: [PATCH] use VK_LAYER_KHRONOS_validation, prevent get_sampler and get_view to triger sigsev --- CMakeLists.txt | 1 + src/vkh_app.c | 2 +- src/vkh_image.c | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c940cce..ccef8e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,7 @@ if (NOT VULKAN_SDK) if (VULKAN_SDK) set(ENV{VULKAN_SDK} ${VULKAN_SDK}) SET(ENV{VK_LAYER_PATH} "${VULKAN_SDK}/etc/explicit_layer.d") + link_directories("${VULKAN_SDK}/lib") endif () endif () diff --git a/src/vkh_app.c b/src/vkh_app.c index da7c527..50388ce 100644 --- a/src/vkh_app.c +++ b/src/vkh_app.c @@ -36,7 +36,7 @@ VkhApp vkh_app_create (const char* app_name, uint32_t ext_count, const char* ext .apiVersion = VK_API_VERSION_1_0}; #if VKH_USE_VALIDATION const uint32_t enabledLayersCount = 1; - const char* enabledLayers[] = {"VK_LAYER_LUNARG_standard_validation"}; + const char* enabledLayers[] = {"VK_LAYER_KHRONOS_validation"}; #else const uint32_t enabledLayersCount = 0; const char* enabledLayers[] = {NULL}; diff --git a/src/vkh_image.c b/src/vkh_image.c index d89d6e2..f6c4f6f 100644 --- a/src/vkh_image.c +++ b/src/vkh_image.c @@ -135,12 +135,18 @@ VkImage vkh_image_get_vkimage (VkhImage img){ return img->image; } VkSampler vkh_image_get_sampler (VkhImage img){ + if (img == NULL) + return NULL; return img->sampler; } VkImageView vkh_image_get_view (VkhImage img){ + if (img == NULL) + return NULL; return img->view; } VkImageLayout vkh_image_get_layout (VkhImage img){ + if (img == NULL) + return VK_IMAGE_LAYOUT_UNDEFINED; return img->layout; } VkDescriptorImageInfo vkh_image_get_descriptor (VkhImage img, VkImageLayout imageLayout){ -- 2.47.3