Merge branch 'pkristof/rc_3_2025' into 'main'

Remix update 03/2025

Closes REMIX-3923

See merge request lightspeedrtx/dxvk-remix-nv!1360

Author: pkristof

.gitmodules

@@ -25,5 +25,14 @@
 	url = https://github.com/KhronosGroup/Vulkan-Headers
 [submodule "submodules/rtxdi"]
 	path = submodules/rtxdi
-	url = https://github.com/NVIDIAGameWorks/RTXDI.git
+	url = https://github.com/NVIDIA-RTX/RTXDI
 	branch = remix
+[submodule "submodules/rtxcr"]
+	path = submodules/rtxcr
+	url = https://github.com/NVIDIA-RTX/RTXCR-Material-Library.git
+[submodule "submodules/nrc"]
+	path = submodules/nrc
+	url = https://github.com/NVIDIAGameWorks/Neural-Radiance-Cache.git
+[submodule "submodules/nvapi/nvapi"]
+	path = submodules/nvapi
+	url = https://github.com/NVIDIA/nvapi.git

RtxOptions.md

@@ -14,3 +14,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 ### Removed
+
+
+## [0.4.3]
+
+### Added
+- remixapi_MaterialInfoOpaqueSubsurfaceEXT.subsurfaceDiffusionProfile
+- remixapi_MaterialInfoOpaqueSubsurfaceEXT.subsurfaceRadius
+- remixapi_MaterialInfoOpaqueSubsurfaceEXT.subsurfaceRadiusScale
+- remixapi_MaterialInfoOpaqueSubsurfaceEXT.subsurfaceMaxSampleRadius
+
+### Changed
+
+### Fixed
+
+### Removed

documentation/RemixApiChangelog.md

@@ -25,3 +25,21 @@ Caveats/limitations:
 Future considerations / not supported (yet):
 - Material constants per input terrain replacement material.
 - Orthogonal surfaces (i.e. walls with floor) and separate multi-layer surfaces (i.e. baked road on a bridge over another baked road below). For these cases you can use the decal system. The benefit of the terrain system to the decal system is that the terrain baking exactly replicates original game's blending while the decal system only approximates the original blending. On the other hand, decal system supports blending in any direction and the input decal textures are sampled at the desired resolution at the time of ray hits the surface while the terrain system resamples original textures to a shared terrain texture. This can result in a of loss of image fidelity depending on the parametrization of the terrain system (see [rtx.terrainBaker.*](../RtxOptions.md)).
+
+
+## Terrain as decals
+
+If a game draws a terrain as: an opaque draw call and blending translucent draw calls on top, then potentially, a terrain can be emulated via decals, since there's an opaque termination surface.
+
+Such terrain-as-decals behaviour is set when the terrain baker 'Enable Runtime Terrain Baking' (`rtx.terrainBaker.enableBaking`) is disabled, so that the draw calls that are marked as 'Terrain' will be internally handled as a decal.
+
+Advantages of terrain-as-decals:
+- Lower VRAM consumption as there are no terrain baking render targets.
+- Lower CPU workload, as draw calls don't need be preprocessed.
+- Less GPU context switches caused by rasterization of each terrain piece and layer in a specific way.
+- Can handle orthogonal surfaces (e.g. a horizontal beach and vertical cliff can be handled).
+- Higher resolution texture blending compared to using terrain baker cascades.
+
+Disadvantages of terrain-as-decals:
+- The method is not applicable if terrain does NOT have an opaque surface draw call, as then decals won't have a termination point.
+- Potentially, higher GPU workload, as there are more rays to trace against the decals.

documentation/TerrainSystem.md

@@ -168,7 +168,8 @@ add_global_arguments('/DREMIX_LIBRARY_EXPORTS=1', language : 'cpp')
 
 dxvk_include_dirs = [
   './include',
-  './include/vulkan/include'
+  './include/vulkan/include',
+  'submodules/nrc/include',
 ]
 
 dxvk_include_path = include_directories(dxvk_include_dirs)
@@ -263,9 +264,9 @@ python_interpreter = find_program('python3', 'python')
 shader_compile_script = join_paths(global_src_root_norm, 'scripts-common/compile_shaders.py')
 
 # GLSL compiler...
+# Note: The GLSL compiler in Meson is only used for DXVK shaders currently. RTX shaders use the shader compile script and have
+# their options/arguments within that script.
 
-# The ShaderManager::compileShaders() function also uses glslangValidator to compile shader source for debug purpose.
-# If the command here is changed, the command in that function should also be updated.
 glsl_args = [ '-V', '--vn', '@BASENAME@', '@INPUT@', '-o', '@OUTPUT@', '--target-env', 'vulkan1.2', '@EXTRA_ARGS@' ]
 
 if run_command(glsl_compiler, [ '--quiet', '--version' ], check: false).returncode() == 0
@@ -404,11 +405,13 @@ boost_include_path = include_directories('external/nv_usd/include/boost-1_78/')
 usd_include_paths = [nv_usd_include_path, boost_include_path]
 
 vk_include_path = include_directories('./include/vulkan/include')
+# required for NV_present_metering
+add_project_arguments('-DVK_ENABLE_BETA_EXTENSIONS', language : 'cpp')
 
 lssusd_include_paths = [nv_usd_include_path, boost_include_path, vk_include_path]
 
-nvapi_include_paths = include_directories('external/nvapi')
-nvapi_lib_path = join_paths(global_src_root_norm, 'external/nvapi/amd64')
+nvapi_include_paths = include_directories('submodules/nvapi')
+nvapi_lib_path = join_paths(global_src_root_norm, 'submodules/nvapi/amd64')
 nvapi_lib = dxvk_compiler.find_library('nvapi64', dirs : nvapi_lib_path)
 
 # Cache lib locations
@@ -439,6 +442,9 @@ dlfg_root_path = 'external/ngx_sdk_dlfg'
 dlfg_lib_path = join_paths(global_src_root_norm, dlfg_root_path, 'lib/Windows_x86_64/rel/')
 external_dll_paths += dlfg_lib_path
 
+nrc_dll_name = 'NRC_Vulkan.dll'
+nrc_dll_path = join_paths(global_src_root_norm, 'submodules/nrc/bin/')
+
 nrd_lib_path = join_paths(global_src_root_norm, 'external/nrd/Lib/Release/')
 if get_option('buildtype') == 'debug'  
   nrd_lib_path = join_paths(global_src_root_norm, 'external/nrd/Lib/Debug/')
@@ -448,6 +454,10 @@ rtxdi_include_path = include_directories('submodules/rtxdi/rtxdi-sdk/include')
 # Need to use the include path as an argument to the shader build string,
 # and I couldn't find how to convert the IncludeDirs thing to a string... Meson.
 rtxdi_include_path_string = join_paths(global_src_root_norm, 'submodules/rtxdi/rtxdi-sdk/include')
+volumetrics_include_path_string = join_paths(global_src_root_norm, 'submodules/rtxdi/rtxdi-sdk/include/volumetrics')
+
+rtxcr_include_path = include_directories('submodules/rtxcr/shaders/include')
+rtxcr_include_path_string = join_paths(global_src_root_norm, 'submodules/rtxcr/shaders/include')
 
 if not dxvk_is_ninja
   # Copy dependencies that must be in same dir as executable to _output dir
@@ -479,6 +489,21 @@ if not dxvk_is_ninja
     build_by_default : true,
     command          : [copy_script_path, usd_lib_path, output_dir, tbbmalloc_dll_name] )
 
+  copy_nrc_dll_target = custom_target('copy_nrc_dll',
+    output           : ['copy_nrc_dll'],
+    build_by_default : true,
+    command          : [copy_script_path, nrc_dll_path, output_dir, nrc_dll_name] )
+
+  copy_nrc_cuda_deps_dll_target = custom_target('copy_nrc_cuda_deps_dll',
+    output           : ['copy_nrc_cuda_deps_dll'],
+    build_by_default : true,
+    command          : [copy_script_path, nrc_dll_path, output_dir, 'cudart64_12.dll'] )
+
+  copy_nrc_cuda_nv_deps_dll_target = custom_target('copy_nrc_cuda_nv_deps_dll',
+    output           : ['copy_nrc_cuda_nv_deps_dll'],
+    build_by_default : true,
+    command          : [copy_script_path, nrc_dll_path, output_dir, 'nvrtc*.dll'] )
+
   copy_nrd_dll_target = custom_target('copy_nrd_dll',
     output           : ['copy_nrd_dll'],
     build_by_default : true,
@@ -592,6 +617,8 @@ if dxvk_is_ninja
   # meson seems to force / as the path separator in custom_target
   # ... except in the case where the path separators are inconsistent, in which case it does nothing
   # force / as the path separator here to make sure it stays consistent
+  nrc_lib_path = join_paths(global_src_root_norm, 'submodules/nrc/Lib/')
+ 
   nrd_lib_path = join_paths(global_src_root_norm, 'external/nrd/Lib/Release/')
   if get_option('buildtype') == 'debug'
     nrd_lib_path = join_paths(global_src_root_norm, 'external/nrd/Lib/Debug/')
@@ -696,6 +723,27 @@ if dxvk_is_ninja
                           output_path,
                           tbbmalloc_dll_name] )
 
+    copy_nrc_dll = custom_target('copy_nrc_dll_' + target_suffix,
+      output           : ['copy_nrc_dll_' + target_suffix],
+      command          : [copy_script_path,
+                          nrc_dll_path,
+                          output_path,
+                          nrc_dll_name] )
+
+    copy_nrc_cuda_deps_dll = custom_target('copy_nrc_cuda_deps_dll_' + target_suffix,
+      output           : ['copy_nrc_cuda_deps_dll_' + target_suffix],
+      command          : [copy_script_path,
+                          nrc_dll_path,
+                          output_path,
+                          'cudart64_12.dll'] )
+
+    copy_nrc_cuda_nv_deps_dll = custom_target('copy_nrc_cuda_nv_deps_dll_' + target_suffix,
+      output           : ['copy_nrc_cuda_nv_deps_dll_' + target_suffix],
+      command          : [copy_script_path,
+                          nrc_dll_path,
+                          output_path,
+                          'nvrtc*.dll'] )
+
     copy_nrd_dll = custom_target('copy_nrd_dll_' + target_suffix,
       output           : ['copy_nrd_dll_' + target_suffix],
       command          : [copy_script_path,
@@ -744,12 +792,15 @@ if dxvk_is_ninja
                             copy_usd_dll,
                             copy_tbb_dll,
                             copy_tbbmalloc_dll,
+                            copy_nrc_dll,
+                            copy_nrc_cuda_deps_dll,
+                            copy_nrc_cuda_nv_deps_dll,
                             copy_nrd_dll,
                             copy_dlss_dll,
                             copy_dlfg_dll,
                             copy_aftermath_dll,
                             d3d9_dll ]
-                            
+
     copy_target_depends += copy_reflex_dll
 
     if enable_rtxio == true

include/vulkan

@@ -5,17 +5,11 @@
     <dependency name="fonts" linkPath="external/fonts">
         <package name="rtx-remix-fonts" version="1" />
     </dependency>
-    <dependency name="nrd" linkPath="external/nrd">
-        <package name="rtx-remix-nrd" version="4" />
-    </dependency>
-    <dependency name="nvapi" linkPath="external/nvapi">
-        <package name="rtx-remix-nvapi" version="1" />
-    </dependency>
     <dependency name="nv_usd" linkPath="external/nv_usd">
         <package name="rtx-remix-nv_usd" version="5" />
     </dependency>
     <dependency name="omni_core_materials" linkPath="external/omni_core_materials">
-        <package name="rtx-remix-omni_core_materials" version="15" />
+        <package name="rtx-remix-omni_core_materials" version="16" />
     </dependency>
     <dependency name="reflex" linkPath="external/reflex">
         <package name="rtx-remix-reflex" version="1" />
@@ -32,10 +26,13 @@
     <dependency name="nv_xxd" linkPath="external/nv_xxd">
         <package name="rtx-remix-nv_xxd" version="1" />
     </dependency>
-    <dependency name="ngx_sdk_dldn" linkPath="external/ngx_sdk_dldn">
-        <package name="rtx-remix-ngx_sdk_dldn" version="3" />
-    </dependency>
-    <dependency name="ngx_sdk_dlfg" linkPath="external/ngx_sdk_dlfg">
-        <package name="rtx-remix-ngx_sdk_dlfg" version="1" />
-    </dependency>
+	<dependency name="ngx_sdk_dlfg" linkPath="external/ngx_sdk_dlfg">
+	    <package name="rtx-remix-ngx_sdk_dlfg" version="2" />
+	</dependency>
+	<dependency name="ngx_sdk_dldn" linkPath="external/ngx_sdk_dldn">
+	    <package name="rtx-remix-ngx_sdk_dldn" version="5" />
+	</dependency>
+	<dependency name="nrd" linkPath="external/nrd">
+	    <package name="rtx-remix-nrd" version="4.13" />
+	</dependency>
 </project>

meson.build

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -365,23 +365,30 @@ namespace remix {
       subsurfaceSingleScatteringAlbedoTexture = {};
       subsurfaceTransmittanceColor = { 0.5f, 0.5f, 0.5f };
       subsurfaceMeasurementDistance = 0.0f;
-      subsurfaceSingleScatteringAlbedo = { 0.5f, 0.5f, 0.5f };;
+      subsurfaceSingleScatteringAlbedo = { 0.5f, 0.5f, 0.5f };
       subsurfaceVolumetricAnisotropy = 0.0f;
-      static_assert(sizeof remixapi_MaterialInfoOpaqueSubsurfaceEXT == 72);
+      subsurfaceDiffusionProfile = false;
+      subsurfaceRadius = { 0.5f, 0.5f, 0.5f };
+      subsurfaceRadiusScale = 0.0f;
+      subsurfaceMaxSampleRadius = 0.0f;
+      subsurfaceRadiusTexture = {};
+      static_assert(sizeof remixapi_MaterialInfoOpaqueSubsurfaceEXT == 104);
     }
 
     MaterialInfoOpaqueSubsurfaceEXT(const MaterialInfoOpaqueSubsurfaceEXT& other)
       : remixapi_MaterialInfoOpaqueSubsurfaceEXT(other)
       , cpp_subsurfaceTransmittanceTexture(other.cpp_subsurfaceTransmittanceTexture)
       , cpp_subsurfaceThicknessTexture(other.cpp_subsurfaceThicknessTexture)
-      , cpp_subsurfaceSingleScatteringAlbedoTexture(other.cpp_subsurfaceSingleScatteringAlbedoTexture) {
+      , cpp_subsurfaceSingleScatteringAlbedoTexture(other.cpp_subsurfaceSingleScatteringAlbedoTexture)
+      , cpp_subsurfaceRadiusTexture(other.cpp_subsurfaceRadiusTexture) {
       cpp_fixPointers();
     }
     MaterialInfoOpaqueSubsurfaceEXT(MaterialInfoOpaqueSubsurfaceEXT&& other) noexcept
       : remixapi_MaterialInfoOpaqueSubsurfaceEXT(other)
       , cpp_subsurfaceTransmittanceTexture(std::move(other.cpp_subsurfaceTransmittanceTexture))
       , cpp_subsurfaceThicknessTexture(std::move(other.cpp_subsurfaceThicknessTexture))
-      , cpp_subsurfaceSingleScatteringAlbedoTexture(std::move(other.cpp_subsurfaceSingleScatteringAlbedoTexture)) {
+      , cpp_subsurfaceSingleScatteringAlbedoTexture(std::move(other.cpp_subsurfaceSingleScatteringAlbedoTexture))
+      , cpp_subsurfaceRadiusTexture(std::move(other.cpp_subsurfaceRadiusTexture)) {
       cpp_fixPointers();
     }
     MaterialInfoOpaqueSubsurfaceEXT& operator=(const MaterialInfoOpaqueSubsurfaceEXT& other) {
@@ -392,6 +399,7 @@ namespace remix {
       cpp_subsurfaceTransmittanceTexture          = other.cpp_subsurfaceTransmittanceTexture;
       cpp_subsurfaceThicknessTexture              = other.cpp_subsurfaceThicknessTexture;
       cpp_subsurfaceSingleScatteringAlbedoTexture = other.cpp_subsurfaceSingleScatteringAlbedoTexture;
+      cpp_subsurfaceRadiusTexture                 = other.cpp_subsurfaceRadiusTexture;
       cpp_fixPointers();
       return *this;
     }
@@ -403,6 +411,7 @@ namespace remix {
       cpp_subsurfaceTransmittanceTexture          = std::move(other.cpp_subsurfaceTransmittanceTexture);
       cpp_subsurfaceThicknessTexture              = std::move(other.cpp_subsurfaceThicknessTexture);
       cpp_subsurfaceSingleScatteringAlbedoTexture = std::move(other.cpp_subsurfaceSingleScatteringAlbedoTexture);
+      cpp_subsurfaceRadiusTexture                 = std::move(other.cpp_subsurfaceRadiusTexture);
       cpp_fixPointers();
       return *this;
     }
@@ -419,18 +428,24 @@ namespace remix {
       cpp_subsurfaceSingleScatteringAlbedoTexture = std::move(v);
       subsurfaceSingleScatteringAlbedoTexture = cpp_subsurfaceSingleScatteringAlbedoTexture.c_str();
     }
+    void set_subsurfaceRadiusTexture(std::filesystem::path v) {
+      cpp_subsurfaceRadiusTexture = std::move(v);
+      subsurfaceRadiusTexture = cpp_subsurfaceRadiusTexture.c_str();
+    }
 
   private:
     void cpp_fixPointers() {
       subsurfaceTransmittanceTexture = cpp_subsurfaceTransmittanceTexture.c_str();
       subsurfaceThicknessTexture = cpp_subsurfaceThicknessTexture.c_str();
       subsurfaceSingleScatteringAlbedoTexture = cpp_subsurfaceSingleScatteringAlbedoTexture.c_str();
-      static_assert(sizeof remixapi_MaterialInfoOpaqueSubsurfaceEXT == 72, "Recheck pointers");
+      subsurfaceRadiusTexture = cpp_subsurfaceRadiusTexture.c_str();
+      static_assert(sizeof remixapi_MaterialInfoOpaqueSubsurfaceEXT == 104, "Recheck pointers");
     }
 
     std::filesystem::path cpp_subsurfaceTransmittanceTexture {};
     std::filesystem::path cpp_subsurfaceThicknessTexture {};
     std::filesystem::path cpp_subsurfaceSingleScatteringAlbedoTexture {};
+    std::filesystem::path cpp_subsurfaceRadiusTexture{};
   };
 
   struct MaterialInfoTranslucentEXT : remixapi_MaterialInfoTranslucentEXT {
@@ -759,6 +774,7 @@ namespace remix {
       radius = 0.05f;
       shaping_hasvalue = false;
       shaping_value = detail::defaultLightShaping();
+      volumetricRadianceScale = 1.0f;
       static_assert(sizeof remixapi_LightInfoSphereEXT == 64);
     }
 
@@ -779,6 +795,7 @@ namespace remix {
       direction = { 0.0f, 0.0f, 1.0f };
       shaping_hasvalue = false;
       shaping_value = detail::defaultLightShaping();
+      volumetricRadianceScale = 1.0f;
       static_assert(sizeof remixapi_LightInfoRectEXT == 104);
     }
 
@@ -799,6 +816,7 @@ namespace remix {
       direction = { 0.0f, 0.0f, 1.0f };
       shaping_hasvalue = false;
       shaping_value = detail::defaultLightShaping();
+      volumetricRadianceScale = 1.0f;
       static_assert(sizeof remixapi_LightInfoDiskEXT == 104);
     }
 
@@ -815,7 +833,8 @@ namespace remix {
       radius = 1.0f;
       axis = { 1.0f, 0.0f, 0.0f };
       axisLength = 1.0f;
-      static_assert(sizeof remixapi_LightInfoCylinderEXT == 48);
+      volumetricRadianceScale = 1.0f;
+      static_assert(sizeof remixapi_LightInfoCylinderEXT == 56);
     }
   };
 
@@ -825,7 +844,8 @@ namespace remix {
       pNext = nullptr;
       direction = { 0.0f, -1.0f, 0.0f };
       angularDiameterDegrees = 0.5f;
-      static_assert(sizeof remixapi_LightInfoDistantEXT == 32);
+      volumetricRadianceScale = 1.0f;
+      static_assert(sizeof remixapi_LightInfoDistantEXT == 40);
     }
   };