Removed the RTXGI integration.

Author: Alexey Panteleev

.gitlab-ci.yml

@@ -7,8 +7,6 @@ variables:
   TEST_REPO_BRANCH: main
 
 # Variables that should be specified from the project settings:
-# - GITHUB_USERNAME     : username for the private dependencies on GitHub
-# - GITHUB_ACCESS_TOKEN : access token for the private dependencies on GitHub
 # - TEST_REPO_URL       : URL of the repository with tests, including the username and token parts if necessary
 # - ENABLE_JOBS         : list of jobs to run, such as "build-linux,test-linux"
 
@@ -20,19 +18,6 @@ variables:
 # - Python 3.8+ and scikit-image
 
 
-# Add the GitHub credentials for the submodules
-.checkout-submodules: &checkout-submodules
-  - git submodule set-url RTXGI https://${GITHUB_USERNAME}:${GITHUB_ACCESS_TOKEN}@github.com/NVIDIAGameWorks/RTXGI.git
-  - git submodule set-url NRD https://${GITHUB_USERNAME}:${GITHUB_ACCESS_TOKEN}@github.com/NVIDIAGameWorks/RayTracingDenoiser.git
-  - git submodule update --init --recursive
-
-
-# Remove the credentials to avoid storing them in the runner working tree
-.cleanup-submodules: &cleanup-submodules
-  - git submodule set-url RTXGI https://github.com/NVIDIAGameWorks/RTXGI.git
-  - git submodule set-url NRD https://github.com/NVIDIAGameWorks/RayTracingDenoiser.git
-
-
 # Clone the tests repository
 .clone-tests: &clone-tests
   - git clone -b ${TEST_REPO_BRANCH} ${TEST_REPO_URL} tests
@@ -45,14 +30,11 @@ build-linux:
   rules:
     - if: '$ENABLE_JOBS =~ /build-linux/'
   before_script:
-    - *checkout-submodules
     - ./update_dependencies.sh
   script:
     - mkdir build && cd build
     - cmake .. -GNinja
     - ninja
-  after_script:
-    - *cleanup-submodules
   artifacts:
     name: "rtxdi-linux-${CI_COMMIT_SHORT_SHA}"
     paths:
@@ -65,16 +47,13 @@ build-windows:
   rules:
     - if: '$ENABLE_JOBS =~ /build-windows/'
   before_script:
-    - *checkout-submodules
     - ./update_dependencies.bat
   script:
     - ./set_vs_vars.ps1
     - mkdir build
     - cd build
     - cmake .. -GNinja -DRTXDI_CONSOLE_APP=ON
     - cmake --build .
-  after_script:
-    - *cleanup-submodules
   artifacts:
     name: "rtxdi-windows-${CI_COMMIT_SHORT_SHA}"
     paths:

.gitmodules

@@ -7,6 +7,3 @@
 [submodule "DLSS"]
 	path = DLSS
 	url = https://github.com/NVIDIA/DLSS.git
-[submodule "RTXGI"]
-	path = RTXGI
-	url = https://github.com/NVIDIAGameWorks/RTXGI.git

CMakeLists.txt

@@ -70,22 +70,6 @@ set(DONUT_PATH "${CMAKE_CURRENT_LIST_DIR}/donut")
 include(NRD.cmake)
 include(DLSS.cmake)
 
-if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/RTXGI/CMakeLists.txt")
-	option(RTXDI_WITH_RTXGI "Enable the RTXGI integration" ON)
-
-	if (RTXDI_WITH_RTXGI)
-		option(RTXGI_DDGI_RESOURCE_MANAGEMENT "" ON)
-		option(RTXGI_DDGI_USE_SHADER_CONFIG_FILE "" ON)
-
-		if (UNIX)
-			set(RTXGI_API_VULKAN_SDK ON)
-			set(Vulkan_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/donut/nvrhi/thirdparty/Vulkan-Headers/include")
-		endif()
-
-		add_subdirectory(RTXGI)
-	endif()
-endif()
-
 set(GLSLANG_PATH "" CACHE STRING "Path to glslangValidator for GLSL header verification (optional)")
 
 # Temporarily use cxxopts from NVRHI

README.md

@@ -32,8 +32,6 @@ For more information about RTXDI, see the [NVIDIA Developer Page](https://develo
 
 [`DLSS`](DLSS) is a submodule with the [Deep Learning Super-Sampling SDK](https://github.com/NVIDIA/DLSS).
 
-[`RTXGI`](RTXGI) is a submodule with the [RTX Global Illumination SDK](https://github.com/NVIDIAGameWorks/RTXGI).
-
 Additional contents delivered through packman:
 
 `dxc` is a recent version of DirectX Shader Compiler;

RTXGI

@@ -1,6 +1,6 @@
 
 include("${DONUT_PATH}/compileshaders.cmake")
-file(GLOB shaders "*.h*" "LightingPasses/*.h*" "RTXGI/*.h*" "DebugViz/*.h*" "../rtxdi-sdk/shaders/*.hlsl" "../rtxdi-sdk/include/*.hlsli")
+file(GLOB shaders "*.h*" "LightingPasses/*.h*" "DebugViz/*.h*" "../rtxdi-sdk/shaders/*.hlsl" "../rtxdi-sdk/include/*.hlsli")
 
 set(project rtxdi-sample)
 set(folder "RTXDI SDK")
@@ -16,12 +16,6 @@ else()
    set(NRD_OPTIONS --relaxedInclude NRD.hlsli)
 endif()
 
-if (TARGET RTXGI-D3D12 OR TARGET RTXGI-VK)
-   set(RTXGI_OPTIONS -D WITH_RTXGI)
-else()
-   set(RTXGI_OPTIONS --relaxedInclude "ddgi/Irradiance.hlsl")
-endif()
-
 set (OUTPUT_PATH_BASE "${CMAKE_BINARY_DIR}/bin/shaders/rtxdi-sample")
 
  if (WIN32)
@@ -38,12 +32,8 @@ if (DONUT_WITH_DX12)
       --outputExt .bin
       -I ${DONUT_SHADER_INCLUDE_DIR}
       -I ${CMAKE_CURRENT_SOURCE_DIR}/../rtxdi-sdk/include
-      -I ${CMAKE_CURRENT_SOURCE_DIR}/../RTXGI/shaders
-      -I ${CMAKE_CURRENT_SOURCE_DIR}/RTXGI
       --relaxedInclude "../Types.h"
-      --relaxedInclude "rtxgi\\Types.h"
       ${NRD_OPTIONS}
-      ${RTXGI_OPTIONS}
       ${USE_API_OPTION}
       --compiler ${DXC_PATH})
 
@@ -63,12 +53,8 @@ if (DONUT_WITH_VULKAN)
       --outputExt .bin
       -I ${DONUT_SHADER_INCLUDE_DIR}
       -I ${CMAKE_CURRENT_SOURCE_DIR}/../rtxdi-sdk/include
-      -I ${CMAKE_CURRENT_SOURCE_DIR}/../RTXGI/shaders
-      -I ${CMAKE_CURRENT_SOURCE_DIR}/RTXGI
       --relaxedInclude "../Types.h"
-      --relaxedInclude "rtxgi\\Types.h"
       ${NRD_OPTIONS}
-      ${RTXGI_OPTIONS}
       ${USE_API_OPTION}
       ${NVRHI_DEFAULT_VK_REGISTER_OFFSETS}
       -D SPIRV

shaders/CMakeLists.txt

@@ -36,13 +36,6 @@ Texture2D t_DenoisedSpecular : register(t8);
 
 SamplerState s_EnvironmentSampler : register(s0);
 
-#ifdef WITH_RTXGI
-#include "RtxgiHelpers.hlsli"
-StructuredBuffer<DDGIVolumeDescGPUPacked> t_DDGIVolumes : register(t10 VK_DESCRIPTOR_SET(2));
-StructuredBuffer<DDGIVolumeResourceIndices> t_DDGIVolumeResourceIndices : register(t11 VK_DESCRIPTOR_SET(2));
-SamplerState s_ProbeSampler : register(s10 VK_DESCRIPTOR_SET(2));
-#endif
-
 [numthreads(8, 8, 1)]
 void main(uint2 globalIdx : SV_DispatchThreadID)
 {
@@ -92,24 +85,6 @@ void main(uint2 globalIdx : SV_DispatchThreadID)
         compositedColor = diffuse_illumination.rgb;
         compositedColor += specular_illumination.rgb;
         compositedColor += emissive.rgb;
-
-#ifdef WITH_RTXGI
-        if (g_Const.numRtxgiVolumes)
-        {
-            float3 worldPosition = viewDepthToWorldPos(g_Const.view, globalIdx, depth);
-
-            float3 indirectIrradiance = GetIrradianceFromDDGI(
-                worldPosition,
-                normal,
-                g_Const.view.cameraDirectionOrPosition.xyz,
-                g_Const.numRtxgiVolumes,
-                t_DDGIVolumes,
-                t_DDGIVolumeResourceIndices,
-                s_ProbeSampler);
-
-            compositedColor += diffuseAlbedo * indirectIrradiance;
-        }
-#endif
     }
     else
     {   

shaders/CompositingPass.hlsl

@@ -26,13 +26,6 @@
 
 #include "ShadingHelpers.hlsli"
 
-#ifdef WITH_RTXGI
-#include "RtxgiHelpers.hlsli"
-StructuredBuffer<DDGIVolumeDescGPUPacked> t_DDGIVolumes : register(t40 VK_DESCRIPTOR_SET(2));
-StructuredBuffer<DDGIVolumeResourceIndices> t_DDGIVolumeResourceIndices : register(t41 VK_DESCRIPTOR_SET(2));
-SamplerState s_ProbeSampler : register(s40 VK_DESCRIPTOR_SET(2));
-#endif
-
 static const float c_MaxIndirectRadiance = 10;
 
 #if USE_RAY_QUERY
@@ -140,22 +133,6 @@ void RayGen()
         float indirectLuminance = calcLuminance(radiance);
         if (indirectLuminance > c_MaxIndirectRadiance)
             radiance *= c_MaxIndirectRadiance / indirectLuminance;
-
-#ifdef WITH_RTXGI
-        if (g_Const.numRtxgiVolumes)
-        {
-            float3 indirectIrradiance = GetIrradianceFromDDGI(
-                secondarySurface.worldPos,
-                secondarySurface.normal,
-                primarySurface.worldPos,
-                g_Const.numRtxgiVolumes,
-                t_DDGIVolumes,
-                t_DDGIVolumeResourceIndices,
-                s_ProbeSampler);
-
-            radiance += indirectIrradiance * secondarySurface.diffuseAlbedo;
-        }
-#endif
     }
 
     bool outputShadingResult = true;