debug cmake, update vkh

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc0670db68626dd954f5e2b7f5aa2a9f83ee0656..d7b90ca57bff1066cfca313b655ae8fd4e0f183f 100644 (file)
--- 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 dbb60ff40bb78e19391afbc7153a199a281a87e3..012ca283a29bca6dd6b828406fe490ff356484f1 160000 (submodule)
--- a/vkh
+++ b/vkh
@@ -1 +1 @@
-Subproject commit dbb60ff40bb78e19391afbc7153a199a281a87e3
+Subproject commit 012ca283a29bca6dd6b828406fe490ff356484f1