Merge branch 'master' into more_fft_utils

Author: Fletterio

3rdparty/dxc/dxc

@@ -12,6 +12,8 @@ if(NBL_REQUEST_SSE_AXV2)
 	NBL_REQUEST_COMPILE_OPTION_SUPPORT("/arch:AVX2")
 endif()
 
+NBL_REQUEST_COMPILE_OPTION_SUPPORT(/Zc:preprocessor)
+
 # Debug
 set(NBL_C_DEBUG_COMPILE_OPTIONS
 	/Ob0 /Od /MP${_NBL_JOBS_AMOUNT_} /fp:fast /Zc:wchar_t /INCREMENTAL

cmake/adjust/template/windows/msvc.cmake

@@ -3,6 +3,6 @@
 #elif !defined(_GIT_INFO_H_INCLUDED_)
 	#error logging macros require git meta info, include "git_info.h"
 #else
-	#define NBL_LOG(SEVERITY, FORMAT, ...) NBL_LOG_FUNCTION(FORMAT" [%s][%s - %s:%d]", SEVERITY, __VA_ARGS__, nbl::gtml::nabla_git_info.commitShortHash, __FUNCTION__, __FILE__, __LINE__);
-	#define NBL_LOG_ERROR(FORMAT, ...) NBL_LOG(nbl::system::ILogger::ELL_ERROR, FORMAT, __VA_ARGS__)
+	#define NBL_LOG(SEVERITY, FORMAT, ...) NBL_LOG_FUNCTION(FORMAT" [%s][%s - %s:%d]", SEVERITY __VA_OPT__(,) __VA_ARGS__, nbl::gtml::nabla_git_info.commitShortHash, __FUNCTION__, __FILE__, __LINE__);
+	#define NBL_LOG_ERROR(FORMAT, ...) NBL_LOG(nbl::system::ILogger::ELL_ERROR, FORMAT __VA_OPT__(,) __VA_ARGS__)
 #endif