From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Mon, 21 Feb 2022 05:08:27 +0000 (+0100)
Subject: don't automatically enable scalar block if vk version = 1.2
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=2775eb5e0712ed056d45c1fc34c5d576063be62e;p=jp%2Fvkvg.git

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89542ed..46640ff 100644
--- 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 a16b674..d0b8def 100644
--- 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))