create NBL_REQUEST_COMPILE_OPTION_SUPPORT, update msvc.cmake profile compile options - allow for SSE 4.2 & AVX2 toggle, for unix compilers allow to enable F16C for converting between half-precision and standard IEEE single-precision floating-point formats support, fix issues with built-ins after virtual texture sources removal

AnastaZIuk · AnastaZIuk · commit 29de22ac8ef1 · 2024-10-23T14:43:57.000+02:00
diff --git a/cmake/adjust/flags.cmake b/cmake/adjust/flags.cmake
@@ -1,26 +1,58 @@
 include_guard(GLOBAL)
 
+include(CheckCCompilerFlag)
+include(CheckCXXCompilerFlag)
+
+if(NOT DEFINED _NBL_JOBS_AMOUNT_)
+	message(WARNING "\"${CMAKE_CURRENT_LIST_FILE}\" included without defined \"_NBL_JOBS_AMOUNT_\", setting it to \"1\"")
+	set(_NBL_JOBS_AMOUNT_ 1)
+endif()
+
 define_property(TARGET PROPERTY NBL_CONFIGURATION_MAP
   BRIEF_DOCS "Stores configuration map for a target, it will evaluate to the configuration it's mapped to"
 )
 
-macro(_NBL_IMPL_GET_FLAGS_PROFILE_)
-	if(MSVC)
-		include("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/template/windows/msvc.cmake")
-	elseif(ANDROID)
-		include("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/template/unix/android.cmake")
-	elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-		include("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/template/unix/gnu.cmake")
-	elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-		include("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/template/unix/clang.cmake")
-	else()
-		message(WARNING "UNTESTED COMPILER DETECTED, EXPECT WRONG OPTIMIZATION FLAGS! SUBMIT ISSUE ON GITHUB https://github.com/Devsh-Graphics-Programming/Nabla/issues")
-	endif()
-endmacro()
+function(NBL_REQUEST_COMPILE_OPTION_SUPPORT _NBL_COMPILE_OPTION_)
+    set(NBL_COMPILE_OPTION "${_NBL_COMPILE_OPTION_}")
 
-function(NBL_EXT_P_APPEND_COMPILE_OPTIONS NBL_LIST_NAME MAP_RELEASE MAP_RELWITHDEBINFO MAP_DEBUG)
-	_NBL_IMPL_GET_FLAGS_PROFILE_()
-		
+    foreach(COMPILER IN ITEMS c cxx)
+        string(TOUPPER "${COMPILER}" COMPILER_UPPER)
+
+        string(REGEX REPLACE "[-=:;/.]" "_" flag_signature "${NBL_COMPILE_OPTION}")
+        set(flag_var "__${COMPILER_UPPER}_Flag_${flag_signature}")
+
+        if(COMPILER STREQUAL "c")
+            check_c_compiler_flag("${NBL_COMPILE_OPTION}" ${flag_var})
+        elseif(COMPILER STREQUAL "cxx")
+            check_cxx_compiler_flag("${NBL_COMPILE_OPTION}" ${flag_var})
+        endif()
+
+        if(${flag_var})
+            message(STATUS "Enabled \"${NBL_COMPILE_OPTION}\" ${COMPILER_UPPER} compile option for Nabla projects!")
+            set(NBL_${COMPILER_UPPER}_COMPILE_OPTIONS "${NBL_${COMPILER_UPPER}_COMPILE_OPTIONS};${NBL_COMPILE_OPTION}" PARENT_SCOPE)
+        else()
+            message(STATUS "Disabled \"${NBL_COMPILE_OPTION}\" ${COMPILER_UPPER} compile option for Nabla projects! (no support)")
+        endif()
+    endforeach()
+endfunction()
+
+option(NBL_REQUEST_SSE_4_2 "Request compilation with SSE 4.2 instruction set enabled for Nabla projects" ON)
+option(NBL_REQUEST_SSE_AXV2 "Request compilation with SSE Intel Advanced Vector Extensions 2 for Nabla projects" ON)
+
+# profiles
+if(MSVC)
+	include("${CMAKE_CURRENT_LIST_DIR}/template/windows/msvc.cmake")
+elseif(ANDROID)
+	include("${CMAKE_CURRENT_LIST_DIR}/template/unix/android.cmake")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+	include("${CMAKE_CURRENT_LIST_DIR}/template/unix/gnu.cmake")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	include("${CMAKE_CURRENT_LIST_DIR}/template/unix/clang.cmake")
+else()
+	message(WARNING "UNTESTED COMPILER DETECTED, EXPECT WRONG OPTIMIZATION FLAGS! SUBMIT ISSUE ON GITHUB https://github.com/Devsh-Graphics-Programming/Nabla/issues")
+endif()
+
+function(NBL_EXT_P_APPEND_COMPILE_OPTIONS NBL_LIST_NAME MAP_RELEASE MAP_RELWITHDEBINFO MAP_DEBUG)		
 	macro(NBL_MAP_CONFIGURATION NBL_CONFIG_FROM NBL_CONFIG_TO)
 		string(TOUPPER "${NBL_CONFIG_FROM}" NBL_CONFIG_FROM_U)
 		string(TOUPPER "${NBL_CONFIG_TO}" NBL_CONFIG_TO_U)
@@ -82,8 +114,6 @@ function(nbl_adjust_flags)
 
 	list(APPEND _NBL_OPTIONS_IMPL_ TARGET)
 	cmake_parse_arguments(NBL "" "" "${_NBL_OPTIONS_IMPL_}" ${ARGN})
-		
-	_NBL_IMPL_GET_FLAGS_PROFILE_()
 
 	# TARGET mode
 	if(NBL_TARGET)
diff --git a/cmake/adjust/template/unix/android.cmake b/cmake/adjust/template/unix/android.cmake
@@ -1,3 +1,5 @@
+include_guard(GLOBAL)
+
 include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")
 
 # Debug
diff --git a/cmake/adjust/template/unix/clang.cmake b/cmake/adjust/template/unix/clang.cmake
@@ -1,3 +1,5 @@
+include_guard(GLOBAL)
+
 include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")
 
 # Debug
diff --git a/cmake/adjust/template/unix/common.cmake b/cmake/adjust/template/unix/common.cmake
@@ -1,4 +1,13 @@
+include_guard(GLOBAL)
+
 option(NBL_SANITIZE_THREAD OFF)
+option(NBL_REQUEST_F16C "Request compilation with F16C enabled for Nabla projects" ON)
+
+# https://en.wikipedia.org/wiki/F16C
+# support for converting between half-precision and standard IEEE single-precision floating-point formats
+if(NBL_REQUEST_F16C)
+	NBL_REQUEST_COMPILE_OPTION_SUPPORT("-mf16c")
+endif()
 
 # Debug
 set(NBL_C_DEBUG_COMPILE_OPTIONS
diff --git a/cmake/adjust/template/unix/gnu.cmake b/cmake/adjust/template/unix/gnu.cmake
@@ -1,3 +1,5 @@
+include_guard(GLOBAL)
+
 include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")
 
 # Debug
diff --git a/cmake/adjust/template/windows/msvc.cmake b/cmake/adjust/template/windows/msvc.cmake
@@ -1,10 +1,16 @@
-if(NOT DEFINED _NBL_JOBS_AMOUNT_)
-	message(WARNING "\"${CMAKE_CURRENT_LIST_FILE}\" included without defined \"_NBL_JOBS_AMOUNT_\", setting it to \"1\"")
-	set(_NBL_JOBS_AMOUNT_ 1)
+include_guard(GLOBAL)
+
+# https://learn.microsoft.com/en-us/cpp/build/reference/arch-x64?view=msvc-170
+
+# The default instruction set is SSE2 if no /arch option is specified.
+if(NBL_REQUEST_SSE_4_2)
+	NBL_REQUEST_COMPILE_OPTION_SUPPORT("/arch:SSE4.2")
 endif()
 
-# notes:
-# /arch:sse3 or anything like this is not needed on x64 on MSVC for enabling sse3 instructions
+# Enables Intel Advanced Vector Extensions 2.
+if(NBL_REQUEST_SSE_AXV2)
+	NBL_REQUEST_COMPILE_OPTION_SUPPORT("/arch:AVX2")
+endif()
 
 # Debug
 set(NBL_C_DEBUG_COMPILE_OPTIONS
@@ -50,10 +56,6 @@ set(NBL_RELWITHDEBINFO_COMPILE_OPTIONS
 	$<$<COMPILE_LANGUAGE:C>:${NBL_C_RELWITHDEBINFO_COMPILE_OPTIONS}>
 )
 
-# Global
-unset(NBL_C_COMPILE_OPTIONS)
-unset(NBL_CXX_COMPILE_OPTIONS)
-
 if(NBL_SANITIZE_ADDRESS)
 	list(APPEND NBL_C_COMPILE_OPTIONS /fsanitize=address)
 	list(APPEND NBL_CXX_COMPILE_OPTIONS ${NBL_C_COMPILE_OPTIONS})
diff --git a/src/nbl/builtin/CMakeLists.txt b/src/nbl/builtin/CMakeLists.txt
@@ -157,10 +157,6 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/utils/normal_decode.glsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/utils/normal_encode.glsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/utils/transform.glsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/utils/morton.glsl")
-# virtual texturing
-LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/virtual_texturing/descriptors.glsl")
-LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/virtual_texturing/extensions.glsl")
-LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/virtual_texturing/impl_functions.glsl")
 # workgroup "intrinsics"
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/workgroup/arithmetic.glsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/workgroup/basic.glsl")

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+include_guard(GLOBAL)`
	`2`	`+`
`1`	`3`	`include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")`
`2`	`4`
`3`	`5`	`# Debug`