use VK_LAYER_KHRONOS_validation, prevent get_sampler and get_view to triger sigsev

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c940cce8ee94d193b20a4d0c6607c399354d706c..ccef8e3a815f4844878655260694d7933ed6f538 100644 (file)
--- 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 da7c52776f55a11f7dc7e84b98436461645d0d7c..50388cef2f1b8b7fd9fb95be8104d63beab575eb 100644 (file)
--- 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 d89d6e2e61ef3f796bf436966423b0d38972e3a6..f6c4f6faa3ffe26ceb8c04a568d23eef13649f52 100644 (file)
--- 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){