diff options
| author | skallweitNV <64953474+skallweitNV@users.noreply.github.com> | 2024-05-12 00:11:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-11 15:11:44 -0700 |
| commit | e0054151b5b1b4bc44312e3ca737aa2a9a04ff35 (patch) | |
| tree | 8d063554fd9c71e9bad3b76a806d604f28dbf4b1 /tools/gfx/debug-layer | |
| parent | 86a9da1573e1eea62fbaeddc97521f2b97ebc255 (diff) | |
add missing Result to IRayTracingCommandEncoder::bindPipline (#4148)
Diffstat (limited to 'tools/gfx/debug-layer')
| -rw-r--r-- | tools/gfx/debug-layer/debug-command-encoder.cpp | 5 | ||||
| -rw-r--r-- | tools/gfx/debug-layer/debug-command-encoder.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/gfx/debug-layer/debug-command-encoder.cpp b/tools/gfx/debug-layer/debug-command-encoder.cpp index b7b06c2f4..6838732a0 100644 --- a/tools/gfx/debug-layer/debug-command-encoder.cpp +++ b/tools/gfx/debug-layer/debug-command-encoder.cpp @@ -470,16 +470,17 @@ void DebugRayTracingCommandEncoder::deserializeAccelerationStructure( baseObject->deserializeAccelerationStructure(getInnerObj(dest), source); } -void DebugRayTracingCommandEncoder::bindPipeline( +Result DebugRayTracingCommandEncoder::bindPipeline( IPipelineState* state, IShaderObject** outRootObject) { SLANG_GFX_API_FUNC; auto innerPipeline = getInnerObj(state); IShaderObject* innerRootObject = nullptr; commandBuffer->rootObject.reset(); - baseObject->bindPipeline(innerPipeline, &innerRootObject); + Result result = baseObject->bindPipeline(innerPipeline, &innerRootObject); commandBuffer->rootObject.baseObject.attach(innerRootObject); *outRootObject = &commandBuffer->rootObject; + return result; } Result DebugRayTracingCommandEncoder::bindPipelineWithRootObject( diff --git a/tools/gfx/debug-layer/debug-command-encoder.h b/tools/gfx/debug-layer/debug-command-encoder.h index a0c03e84c..152a1a733 100644 --- a/tools/gfx/debug-layer/debug-command-encoder.h +++ b/tools/gfx/debug-layer/debug-command-encoder.h @@ -276,7 +276,7 @@ public: virtual SLANG_NO_THROW void SLANG_MCALL deserializeAccelerationStructure( IAccelerationStructure* dest, DeviceAddress source) override; - virtual SLANG_NO_THROW void SLANG_MCALL + virtual SLANG_NO_THROW Result SLANG_MCALL bindPipeline(IPipelineState* state, IShaderObject** outRootObject) override; virtual SLANG_NO_THROW Result SLANG_MCALL bindPipelineWithRootObject(IPipelineState* state, IShaderObject* rootObject) override; |
