examples: Fixes for ray-tracing examples

- Assert that accelleration structure buffer is not nullptr - Check if buffer creation succeeded before proceeding - This makes initialization not hang, but it still fails. Therefore, the test expectations are just updated to point to another issue. - Enable ray-tracing tests on Windows
shader-slang · Jan 3, 2025 · 60b9318 · 60b9318
1 parent 794c21b
commit 60b9318
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/examples/ray-tracing-pipeline/main.cpp b/examples/ray-tracing-pipeline/main.cpp
@@ -382,13 +382,17 @@ struct RayTracing : public WindowedAppBase
             asDraftBufferDesc.sizeInBytes =
                 (size_t)accelerationStructurePrebuildInfo.resultDataMaxSize;
             ComPtr<IBufferResource> draftBuffer = gDevice->createBufferResource(asDraftBufferDesc);
+            if (!draftBuffer)
+                return SLANG_FAIL;
             IBufferResource::Desc scratchBufferDesc;
             scratchBufferDesc.type = IResource::Type::Buffer;
             scratchBufferDesc.defaultState = ResourceState::UnorderedAccess;
             scratchBufferDesc.sizeInBytes =
                 (size_t)accelerationStructurePrebuildInfo.scratchDataSize;
             ComPtr<IBufferResource> scratchBuffer =
                 gDevice->createBufferResource(scratchBufferDesc);
+            if (!scratchBuffer)
+                return SLANG_FAIL;
 
             // Build acceleration structure.
             ComPtr<IQueryPool> compactedSizeQuery;

diff --git a/examples/ray-tracing/main.cpp b/examples/ray-tracing/main.cpp
@@ -373,12 +373,16 @@ struct RayTracing : public WindowedAppBase
             asDraftBufferDesc.defaultState = ResourceState::AccelerationStructure;
             asDraftBufferDesc.sizeInBytes = accelerationStructurePrebuildInfo.resultDataMaxSize;
             ComPtr<IBufferResource> draftBuffer = gDevice->createBufferResource(asDraftBufferDesc);
+            if (!draftBuffer)
+                return SLANG_FAIL;
             IBufferResource::Desc scratchBufferDesc;
             scratchBufferDesc.type = IResource::Type::Buffer;
             scratchBufferDesc.defaultState = ResourceState::UnorderedAccess;
             scratchBufferDesc.sizeInBytes = accelerationStructurePrebuildInfo.scratchDataSize;
             ComPtr<IBufferResource> scratchBuffer =
                 gDevice->createBufferResource(scratchBufferDesc);
+            if (!scratchBuffer)
+                return SLANG_FAIL;
 
             // Build acceleration structure.
             ComPtr<IQueryPool> compactedSizeQuery;

diff --git a/tests/expected-example-failure-github.txt b/tests/expected-example-failure-github.txt
@@ -11,5 +11,5 @@ macos:aarch64:(debug|release):hello-world           # See issue 5520
 macos:aarch64:(debug|release):model-viewer          # See issue 5520
 macos:aarch64:(debug|release):ray-tracing           # See issue 5520
 macos:aarch64:(debug|release):ray-tracing-pipeline  # See issue 5520
-windows:x86_64:debug:ray-tracing                    # See issue 5520
-windows:x86_64:debug:ray-tracing-pipeline           # See issue 5520
+windows:x86_64:debug:ray-tracing                    # See issue 5988
+windows:x86_64:debug:ray-tracing-pipeline           # See issue 5988
diff --git a/tools/gfx/d3d12/d3d12-device.cpp b/tools/gfx/d3d12/d3d12-device.cpp
@@ -2231,6 +2231,7 @@ Result DeviceImpl::createAccelerationStructure(
     IAccelerationStructure** outAS)
 {
 #if SLANG_GFX_HAS_DXR_SUPPORT
+    assert(desc.buffer != nullptr);
     RefPtr<AccelerationStructureImpl> result = new AccelerationStructureImpl();
     result->m_device5 = m_device5;
     result->m_buffer = static_cast<BufferResourceImpl*>(desc.buffer);