don't automatically enable scalar block if vk version = 1.2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89542ed1c1fe9a880b6ec37f01125375e935ebf9..46640ffa504f0e5a275a06c7636a4472087a4ecc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,7 +129,7 @@ CMAKE_DEPENDENT_OPTION(VKVG_BUILD_DOCS              "build documentation" OFF "DOXYGEN_FOUND
 CMAKE_DEPENDENT_OPTION(VKVG_LCD_FONT_FILTER "enable freetype lcd font filtering" OFF "VKVG_USE_FONTCONFIG" OFF)
 
 # todo if cmake vers >= 3.23: make dependent option on Vulkan_VERSION >= 1_2:
-OPTION(VKVG_VK_SCALAR_BLOCK_SUPPORTED "Force scalar block layout support if vulkan version < 1_2" OFF)
+OPTION(VKVG_VK_SCALAR_BLOCK_SUPPORTED "Enable scalar block layout support." ON)
 IF (VKVG_VK_SCALAR_BLOCK_SUPPORTED)
     ADD_DEFINITIONS (-DVKVG_VK_SCALAR_BLOCK_SUPPORTED)
 ENDIF ()

diff --git a/include/vkvg.h b/include/vkvg.h
index a16b67448885444a2b84db9f7c3a79077e82287e..d0b8deffbea78141182b046cfdbb856030472183 100644 (file)
--- a/include/vkvg.h
+++ b/include/vkvg.h
@@ -67,12 +67,6 @@ extern "C" {
 #include <math.h>
 #include <stdbool.h>
 
-#ifdef VK_VERSION_1_2
-       #ifndef VKVG_VK_SCALAR_BLOCK_SUPPORTED
-               #define VKVG_VK_SCALAR_BLOCK_SUPPORTED 1
-       #endif
-#endif
-
 #ifndef vkvg_public
        #ifdef VKVG_SHARED_BUILD
                #if (defined(_WIN32) || defined(_WIN64))