From a35493023e00e276df7df29eaaeeeaa185f45c98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Wed, 8 Aug 2018 09:54:34 +0200 Subject: [PATCH] debug cmake, update vkh --- CMakeLists.txt | 9 ++++++--- vkh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bc0670d..d7b90ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,9 @@ ENDIF() if (CMAKE_BUILD_TYPE STREQUAL "Debug") ADD_DEFINITIONS (-DDEBUG) + OPTION(ENABLE_VALIDATION "enable vulkan validation layer" ON) +ELSE() + OPTION(ENABLE_VALIDATION "enable vulkan validation layer" OFF) ENDIF() OPTION(VKVG_TILING_OPTIMAL "use VK_IMAGE_TILING_OPTIMAL for surface backend texture" OFF) @@ -30,7 +33,7 @@ endif () add_subdirectory (vkh) -SET(ENABLE_VALIDATION OFF CACHE BOOL "Enable vulkan validation layer") +#SET(ENABLE_VALIDATION OFF CACHE BOOL "Enable vulkan validation layer") IF (ENABLE_VALIDATION) ADD_DEFINITIONS (-DVKVG_USE_VALIDATION) @@ -172,9 +175,9 @@ MESSAGE(STATUS "\n\n------------------------------------------------------------ MESSAGE(STATUS "VULKAN_SDK\t\t= $ENV{VULKAN_SDK}") MESSAGE(STATUS "VK_LAYER_PATH\t= $ENV{VK_LAYER_PATH}") IF (ENABLE_VALIDATION) - MESSAGE(STATUS "Validation\t\t= disabled.") -ELSE () MESSAGE(STATUS "Validation\t\t= enabled.") +ELSE () + MESSAGE(STATUS "Validation\t\t= disabled.") ENDIF () IF (VKVG_TILING_OPTIMAL) MESSAGE(STATUS "Surface tiling\t= VK_IMAGE_TILING_OPTIMAL.") diff --git a/vkh b/vkh index dbb60ff..012ca28 160000 --- a/vkh +++ b/vkh @@ -1 +1 @@ -Subproject commit dbb60ff40bb78e19391afbc7153a199a281a87e3 +Subproject commit 012ca283a29bca6dd6b828406fe490ff356484f1 -- 2.47.3