Merge branch 'master' into raytracing_pipeline

# Conflicts:
#	include/nbl/builtin/hlsl/enums.hlsl
#	src/nbl/asset/utils/CHLSLCompiler.cpp

Author: kevyuu

3rdparty/Vulkan-Headers

@@ -193,6 +193,64 @@ option(NBL_BUILD_BULLET "Enable Bullet Physics building and integration?" OFF)
 option(NBL_BUILD_DOCS "Enable building documentation?" OFF) # No one has doxygen installed, plus we dont know when was the last time we generated working doxy and we'll use SphinX in the future
 option(NBL_ENABLE_PROJECT_JSON_CONFIG_VALIDATION "" ON)
 option(NBL_EMBED_BUILTIN_RESOURCES "Embed built-in resources?" ON)
+option(NBL_ENABLE_DOCKER_INTEGRATION "Enables docker integration, if client is not found Docker Desktop will be installed" OFF)
+
+if (NBL_ENABLE_DOCKER_INTEGRATION)
+	if (NOT CMAKE_HOST_WIN32)
+		message(FATAL_ERROR "NBL_ENABLE_DOCKER_INTEGRATION works only with Windows host machines. Please disable this option")
+	endif()
+
+	find_program(DOCKER_EXECUTABLE docker REQUIRED)
+
+	if (DOCKER_EXECUTABLE)
+		message(STATUS "Found docker executable: ${DOCKER_EXECUTABLE}")
+	else()
+		execute_process(COMMAND powershell -Command "& {
+			Invoke-WebRequest -Uri https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe -OutFile DockerDesktopInstaller.exe;
+			$exitCode = Start-Process -Wait -FilePath .\\DockerDesktopInstaller.exe -ArgumentList 'install','--quiet','--accept-license','--backend=wsl-2','--always-run-service';
+			Remove-Item -Force DockerDesktopInstaller.exe;
+			exit $exitCode;
+		}" RESULT_VARIABLE DOCKER_INSTALLER_EXIT_CODE)
+
+		if (DOCKER_INSTALLER_EXIT_CODE NOT EQUAL 0)
+			message(FATAL_ERROR "Docker installer exited with non-zero return code")
+		endif()
+	endif()
+	
+	message(STATUS "Docker endpoint healty check..")
+	set(DDT_MAX_ATTEMPTS 10)
+	set(DDT_DOCKER_RESPONDING False)
+	foreach(ATTEMPT RANGE 1 ${DDT_MAX_ATTEMPTS})
+		message(STATUS "Attempt ${ATTEMPT} of ${DDT_MAX_ATTEMPTS}: Checking Docker Endpoint")
+		NBL_DOCKER(info)
+
+		if (DOCKER_EXIT_CODE EQUAL 0)
+			set(DDT_DOCKER_RESPONDING True)
+			message(STATUS "Docker endpoint detected, the engine is running.")
+			message(STATUS "${DOCKER_OUTPUT_VAR}")
+			break()
+		endif()
+
+		NBL_WAIT_FOR(5)
+	endforeach()
+
+	if (NOT DDT_DOCKER_RESPONDING)
+		message(FATAL_ERROR "Docker Daemon is not responding. Please make sure it's running in the background!")
+	endif()
+
+	set(DNT_NETWORK_NAME "docker_default")
+	NBL_DOCKER(network inspect ${DNT_NETWORK_NAME})
+	if (NOT DOCKER_EXIT_CODE EQUAL 0)
+		message(STATUS "Default docker network doesn't exist, creating \"${DNT_NETWORK_NAME}\" network..")
+		NBL_DOCKER(network create -d nat ${DNT_NETWORK_NAME})
+		
+		if (NOT DOCKER_EXIT_CODE EQUAL 0)
+			message(STATUS "Could not create default docker \"${DNT_NETWORK_NAME}\" network!")
+		endif()
+	endif()
+	
+	message(STATUS "Default docker network: \"${DNT_NETWORK_NAME}\"")
+endif()
 
 set(THIRD_PARTY_SOURCE_DIR "${PROJECT_SOURCE_DIR}/3rdparty")
 set(THIRD_PARTY_BINARY_DIR "${PROJECT_BINARY_DIR}/3rdparty")

3rdparty/dxc/dxc

@@ -200,6 +200,6 @@ function(nbl_adjust_flags)
 			list(APPEND _D_NBL_COMPILE_OPTIONS_ $<$<CONFIG:${NBL_MAP_CONFIGURATION_FROM}>:${NBL_TO_CONFIG_COMPILE_OPTIONS}>)
 		endforeach()
 
-		set_directory_properties(PROPERTIES COMPILE_OPTIONS ${_D_NBL_COMPILE_OPTIONS_})
+		set_directory_properties(PROPERTIES COMPILE_OPTIONS "${_D_NBL_COMPILE_OPTIONS_}")
 	endif()
 endfunction()

CMakeLists.txt

@@ -1334,4 +1334,16 @@ macro(NBL_TARGET_FORCE_ASSEMBLER_EXECUTABLE _NBL_TARGET_ _NBL_ASM_DIALECT_ _NBL_
 		TARGET_DIRECTORY "${_NBL_TARGET_}"
 		PROPERTIES LANGUAGE "${_NBL_ASM_DIALECT_}"
 	)
+endmacro()
+
+macro(NBL_WAIT_FOR SLEEP_DURATION)
+	execute_process(COMMAND ${CMAKE_COMMAND} -E sleep ${SLEEP_DURATION})
+endmacro()
+
+# helper macro for calling docker, takes args as a list of strings
+macro(NBL_DOCKER)
+	execute_process(COMMAND ${DOCKER_EXECUTABLE} ${ARGN} 
+		RESULT_VARIABLE DOCKER_EXIT_CODE 
+		OUTPUT_VARIABLE DOCKER_OUTPUT_VAR
+		)
 endmacro()

README.md

@@ -139,6 +139,9 @@ execute_process(COMMAND "${GIT_EXECUTABLE}" ${NBL_CONFIG_SETUP_CMD} submodule up
 
 			# tests
 			NBL_WRAPPER_COMMAND_EXCLUSIVE("" ./tests FALSE "")
+			
+			# docker
+			NBL_WRAPPER_COMMAND_EXCLUSIVE("" ./docker FALSE "")
 		endmacro()
 
 		NBL_IMPL_INIT_COMMON_SUBMODULES()

cmake/adjust/flags.cmake

@@ -37,16 +37,16 @@ class ICPUSampler : public ISampler, public IAsset
 				};
 				switch (wrapModes[i])
 				{
-					case ISampler::ETC_REPEAT:
+					case ISampler::E_TEXTURE_CLAMP::ETC_REPEAT:
 						repeat();
 						break;
-					case ISampler::ETC_CLAMP_TO_EDGE:
-						texelCoord[i] = core::clamp<int32_t,int32_t>(texelCoord[i],0,mipLastCoord[i]);
+					case ISampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_EDGE:
+						texelCoord[i] = core::clamp<int32_t, int32_t>(texelCoord[i], 0, mipLastCoord[i]);
 						break;
-					case ISampler::ETC_MIRROR_CLAMP_TO_EDGE:
-						texelCoord[i] = core::clamp<int32_t,int32_t>(texelCoord[i],-int32_t(mipExtent[i]),mipExtent[i]+mipLastCoord[i]);
+					case ISampler::E_TEXTURE_CLAMP::ETC_MIRROR_CLAMP_TO_EDGE:
+						texelCoord[i] = core::clamp<int32_t, int32_t>(texelCoord[i], -int32_t(mipExtent[i]), mipExtent[i] + mipLastCoord[i]);
 						[[fallthrough]];
-					case ISampler::ETC_MIRROR:
+					case ISampler::E_TEXTURE_CLAMP::ETC_MIRROR:
 						{
 							int32_t repeatID = (originalWasNegative+texelCoord[i])/int32_t(mipExtent[i]);
 							repeat();