update example conflict

Author: keptsecret

.gitmodules

@@ -114,3 +114,6 @@
 [submodule "3rdparty/libdeflate"]
 	path = 3rdparty/libdeflate
 	url = [email protected]:Devsh-Graphics-Programming/libdeflate.git
+[submodule "docker/compiler-explorer"]
+	path = docker/compiler-explorer
+	url = [email protected]:Devsh-Graphics-Programming/Compiler-Explorer-Docker.git

3rdparty/CMakeLists.txt

@@ -90,8 +90,8 @@ set(_OLD_SKIP_INSTALL_ALL ${SKIP_INSTALL_ALL})
 set(BUILD_SHARED_LIBS OFF)
 set(SKIP_INSTALL_ALL ON)
 
-add_subdirectory(zlib zlib EXCLUDE_FROM_ALL)
 file(LOCK "${CMAKE_CURRENT_SOURCE_DIR}/zlib" DIRECTORY GUARD PROCESS RESULT_VARIABLE NBL_LOCK TIMEOUT 60)
+add_subdirectory(zlib zlib EXCLUDE_FROM_ALL)
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.included")
 	execute_process(COMMAND "${CMAKE_COMMAND}" -E rename zconf.h.included zconf.h 
 			WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/zlib"
@@ -291,6 +291,9 @@ NBL_ADD_GIT_TRACKING_META_LIBRARY(nabla "${NBL_ROOT_PATH}")
 NBL_ADD_GIT_TRACKING_META_LIBRARY(dxc "${CMAKE_CURRENT_SOURCE_DIR}/dxc/dxc")
 NBL_GENERATE_GIT_TRACKING_META()
 
+# NGFX
+include(ngfx/ngfx.cmake)
+
 if(NBL_BUILD_IMGUI)
 	set(NBL_IMGUI_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/imgui")
 	set(NBL_IMGUI_TEST_ENGINE_PROJECT_ROOT "${THIRD_PARTY_SOURCE_DIR}/imgui_test_engine")

3rdparty/dxc/dxc

@@ -0,0 +1,68 @@
+option(NBL_BUILD_WITH_NGFX "Enable NGFX build" OFF)
+
+# NOTE: on windows default installation path is:
+# "C:/Program Files/NVIDIA Corporation/Nsight Graphics <version>/SDKs/NsightGraphicsSDK" <- define as "NGFX_SDK" environment variable
+# then you can pick SDK version with "NGFX_SDK_VERSION" cache variable (CMake GUI list supported)
+
+if(NBL_BUILD_WITH_NGFX)
+    if(NOT DEFINED NGFX_SDK)
+        if(NOT DEFINED ENV{NGFX_SDK})
+            message(FATAL_ERROR "\"NGFX_SDK\" environment variable must be defined to build with NBL_BUILD_WITH_NGFX enabled!")
+        endif()
+        set(NGFX_SDK "$ENV{NGFX_SDK}")
+    endif()
+    cmake_path(NORMAL_PATH NGFX_SDK OUTPUT_VARIABLE NGFX_SDK)
+
+    if(NOT EXISTS "${NGFX_SDK}")
+        message(FATAL_ERROR "Found \"NGFX_SDK\" environment variable but it is invalid, env:NGFX_SDK=\"${NGFX_SDK}\" doesn't exist!")
+    endif()
+
+    file(GLOB ENTRIES "${NGFX_SDK}/*")
+
+    set(NGFX_VERSIONS "")
+    foreach(ENTRY ${ENTRIES})
+        if(IS_DIRECTORY ${ENTRY})
+            list(APPEND NGFX_VERSIONS ${ENTRY})
+        endif()
+    endforeach()
+
+    if(NOT NGFX_VERSIONS)
+        message(FATAL_ERROR "Could not find any NGFX SDK Version!")
+    endif()
+
+    list(TRANSFORM NGFX_VERSIONS REPLACE "${NGFX_SDK}/" "")
+    list(SORT NGFX_VERSIONS)
+    list(GET NGFX_VERSIONS -1 LATEST_NGFX_VERSION)
+
+    # on the cache variable init pick the latest version, then let user pick from list
+    set(NGFX_SDK_VERSION "${LATEST_NGFX_VERSION}" CACHE STRING "NGFX SDK Version")
+    set_property(CACHE NGFX_SDK_VERSION PROPERTY STRINGS ${NGFX_VERSIONS})
+
+    set(NGFX_SDK_VERSION "$CACHE{NGFX_SDK_VERSION}")
+    set(NGFX_SDK_BASE "${NGFX_SDK}/${NGFX_SDK_VERSION}")
+
+    # TODO: wanna support more *host* platforms? (*)
+    # NOTE: also I'm hardcoding windows x64 library requests till I know the answer for (*)
+    find_file(NBL_NGFX_INJECTION_HEADER NGFX_Injection.h PATHS ${NGFX_SDK_BASE}/include)
+    find_file(NBL_NGFX_INJECTION_DLL NGFX_Injection.dll PATHS ${NGFX_SDK_BASE}/lib/x64)
+    find_file(NBL_NGFX_INJECTION_IMPORT_LIBRARY NGFX_Injection.lib PATHS ${NGFX_SDK_BASE}/lib/x64)
+
+    if(NBL_NGFX_INJECTION_HEADER AND NBL_NGFX_INJECTION_DLL AND NBL_NGFX_INJECTION_IMPORT_LIBRARY)
+        message(STATUS "Enabled build with NVIDIA Nsight Graphics SDK ${NGFX_SDK_VERSION}\nlocated in: \"${NGFX_SDK_BASE}\"")
+    else()
+        message(STATUS "Could not enable build with NVIDIA Nsight Graphics SDK ${NGFX_SDK_VERSION} - invalid components!")
+        message(STATUS "Located in: \"${NGFX_SDK_BASE}\"")
+        message(STATUS "NBL_NGFX_INJECTION_HEADER=\"${NBL_NGFX_INJECTION_HEADER}\"")
+        message(STATUS "NBL_NGFX_INJECTION_DLL=\"${NBL_NGFX_INJECTION_DLL}\"")
+        message(STATUS "NBL_NGFX_INJECTION_IMPORT_LIBRARY=\"${NBL_NGFX_INJECTION_IMPORT_LIBRARY}\"")
+        message(FATAL_ERROR "You installation may be corupted, please fix it and re-run CMake or disable NBL_BUILD_WITH_NGFX!")
+    endif()
+
+    add_library(ngfx INTERFACE)
+    target_sources(ngfx INTERFACE "${NBL_NGFX_INJECTION_HEADER}")
+    target_include_directories(ngfx INTERFACE "${NGFX_SDK_BASE}/include")
+    target_link_libraries(ngfx INTERFACE "${NBL_NGFX_INJECTION_IMPORT_LIBRARY}")
+    target_link_options(ngfx INTERFACE "/DELAYLOAD:NGFX_Injection.dll")
+    target_compile_definitions(ngfx INTERFACE NGFX_INJECTION_DLL_DIR="${NGFX_SDK_BASE}/lib/x64")
+    target_compile_definitions(ngfx INTERFACE NGFX_VERSION="${NGFX_SDK_VERSION}")
+endif()

3rdparty/ngfx/ngfx.cmake

@@ -17,6 +17,7 @@ enable_language(C CXX ASM ASM_NASM)
 
 if(MSVC)
 	enable_language(ASM_MASM)
+	link_libraries(delayimp)
 endif()
 
 option(NBL_STATIC_BUILD "" OFF) # ON for static builds, OFF for shared
@@ -222,4 +223,4 @@ add_subdirectory(artifacts)
 option(NBL_CPACK_INCLUDE_EXAMPLES "CPack with examples and media" ON)
 include(cpack/package)
 
-export(TARGETS ${_NBL_3RDPARTY_TARGETS_} Nabla NAMESPACE Nabla:: APPEND FILE ${NBL_ROOT_PATH_BINARY}/NablaExport.cmake)
+export(TARGETS ${_NBL_3RDPARTY_TARGETS_} Nabla NAMESPACE Nabla:: APPEND FILE ${NBL_ROOT_PATH_BINARY}/NablaExport.cmake)

CMakeLists.txt

@@ -0,0 +1,39 @@
+# Define NBL_CONFIG_ROOT_DIRECTORY
+# variable to help the module find 
+# Nabla package
+
+if(NOT DEFINED CMAKE_CONFIGURATION_TYPES)
+	set(CMAKE_CONFIGURATION_TYPES Release;RelWithDebInfo;Debug)
+endif()
+
+if(NOT DEFINED NBL_PACKAGE_STATIC) # turn ON NBL_PACKAGE_STATIC to look for package with STATIC library type, turn off to look for DYNAMIC
+	if(${NBL_STATIC_BUILD}) # internal, if called with Nabla's build system it will get detected autoamtically
+		set(NBL_PACKAGE_STATIC ON)
+	else()
+		message(FATAL_ERROR "NBL_PACKAGE_STATIC must be defined!")
+	endif()
+endif()
+
+if(NBL_PACKAGE_STATIC)
+	set(NBL_LIBRARY_TYPE static)
+else()
+	set(NBL_LIBRARY_TYPE dynamic)
+endif()
+
+foreach(X IN LISTS CMAKE_CONFIGURATION_TYPES)
+	if(NOT "${X}" STREQUAL "")
+		string(TOLOWER "nabla-${NBL_LIBRARY_TYPE}-${X}" _NBL_TARGET_PACKAGE_)
+	
+		if(DEFINED NBL_CONFIG_ROOT_DIRECTORY)
+			file(GLOB_RECURSE _NBL_G_CONFIG_ROOT_DIRECTORY_ "${NBL_CONFIG_ROOT_DIRECTORY}/*/${_NBL_TARGET_PACKAGE_}Config.cmake")
+			cmake_path(GET _NBL_G_CONFIG_ROOT_DIRECTORY_ PARENT_PATH _NBL_G_CONFIG_ROOT_DIRECTORY_)
+		else()
+			unset(_NBL_G_CONFIG_ROOT_DIRECTORY_)
+		endif()
+	
+		find_package(${_NBL_TARGET_PACKAGE_} QUIET
+			GLOBAL
+			PATHS ${_NBL_G_CONFIG_ROOT_DIRECTORY_}
+		)
+	endif()
+endforeach() 

cmake/FindNabla.cmake

@@ -29,8 +29,8 @@ function(nbl_handle_dll_definitions _TARGET_ _SCOPE_)
 		set(_NABLA_OUTPUT_DIR_ "${NBL_ROOT_PATH_BINARY}/src/nbl/$<CONFIG>/devshgraphicsprogramming.nabla")
 
 		target_compile_definitions(${_TARGET_} ${_SCOPE_} 
-			_NABLA_DLL_NAME_="$<TARGET_FILE_NAME:Nabla>";_NABLA_OUTPUT_DIR_="${_NABLA_OUTPUT_DIR_}";_NABLA_INSTALL_DIR_="${CMAKE_INSTALL_PREFIX}"
-		)
+			_NABLA_DLL_NAME_="$<PATH:REMOVE_EXTENSION,$<TARGET_FILE_NAME:Nabla>>";_NABLA_OUTPUT_DIR_="${_NABLA_OUTPUT_DIR_}"
+		)		
 	endif()
 
 	target_compile_definitions(${_TARGET_} ${_SCOPE_} 
@@ -252,6 +252,8 @@ macro(nbl_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
 		target_compile_definitions(${EXECUTABLE_NAME}
 			PRIVATE "-DNBL_CPACK_PACKAGE_NABLA_DLL_DIR=\"${_NBL_NABLA_PACKAGE_RUNTIME_DLL_DIR_PATH_REL_TO_TARGET_}\"" 
 			PRIVATE	"-DNBL_CPACK_PACKAGE_DXC_DLL_DIR=\"${_NBL_DXC_PACKAGE_RUNTIME_DLL_DIR_PATH_REL_TO_TARGET_}\""
+			PRIVATE "-DNBL_CPACK_PACKAGE_NABLA_DLL_DIR_ABS_KEY=\"${_NBL_NABLA_PACKAGE_RUNTIME_DLL_DIR_PATH_}\"" 
+			PRIVATE	"-DNBL_CPACK_PACKAGE_DXC_DLL_DIR_ABS_KEY=\"${_NBL_DXC_PACKAGE_RUNTIME_DLL_DIR_PATH_}\""
 		)
 	endif()
 

cmake/common.cmake

@@ -0,0 +1,6 @@
+list(TRANSFORM @_NBL_PROXY_@ PREPEND "${CMAKE_CURRENT_LIST_DIR}/")
+
+set(@_NBL_COMPOMENT_D_@ "${CMAKE_CURRENT_LIST_DIR}/@_NBL_COMPOMENT_D_V_@")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(@_NBL_PACKAGE_@ DEFAULT_MSG @_NBL_PROXY_@ @_NBL_COMPOMENT_D_@)

cmake/cpack/find/compoment/template.cmake

@@ -0,0 +1,15 @@
+find_package(@_NBL_PACKAGE_@
+	REQUIRED
+	CONFIG
+	GLOBAL
+	PATHS "${CMAKE_CURRENT_LIST_DIR}/compoment"
+	NO_DEFAULT_PATH
+	NO_PACKAGE_ROOT_PATH
+	NO_CMAKE_PATH
+	NO_CMAKE_ENVIRONMENT_PATH
+	NO_SYSTEM_ENVIRONMENT_PATH
+	NO_CMAKE_PACKAGE_REGISTRY
+	NO_CMAKE_SYSTEM_PATH
+	NO_CMAKE_INSTALL_PREFIX
+	NO_CMAKE_SYSTEM_PACKAGE_REGISTRY
+)

cmake/cpack/find/config/template.cmake

@@ -0,0 +1,3 @@
+# Copyright (C) 2018-2025 - DevSH Graphics Programming Sp. z O.O.
+# This file is part of the "Nabla Engine".
+# For conditions of distribution and use, see copyright notice in nabla.h