Merge branch 'owright/fix-dxr-omms' into 'main'

Fix for using the DXR implementation of OMMs

See merge request nvrhi/NVRHI!82

Author: chrisd-work

src/d3d12/d3d12-backend.h

@@ -65,13 +65,13 @@
 #endif
 
 // Line-Swept Spheres were added in NVAPI SDK 572.18
-#if NVRHI_D3D12_WITH_NVAPI && (NVAPI_SDK_VERSION >= 57218)
+#if NVRHI_D3D12_WITH_NVAPI && !NVRHI_D3D12_WITH_DXR12_OPACITY_MICROMAP && (NVAPI_SDK_VERSION >= 57218)
 #define NVRHI_WITH_NVAPI_LSS (1)
 #else
 #define NVRHI_WITH_NVAPI_LSS (0)
 #endif
 
-#if D3D12_PREVIEW_SDK_VERSION >= 717
+#if D3D12_PREVIEW_SDK_VERSION == 717
 #define NVRHI_D3D12_WITH_COOPVEC (1)
 #else
 #define NVRHI_D3D12_WITH_COOPVEC (0)

src/d3d12/d3d12-raytracing.cpp

@@ -1844,7 +1844,7 @@ namespace nvrhi::d3d12
             }
         }
 
-        D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESC asDesc;
+        D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESC asDesc = {};
         asDesc.Inputs = ommInputs;
         asDesc.ScratchAccelerationStructureData = scratchGpuVA;
         asDesc.DestAccelerationStructureData = omm->getDeviceAddress();