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/d3d12 | |
| parent | 86a9da1573e1eea62fbaeddc97521f2b97ebc255 (diff) | |
add missing Result to IRayTracingCommandEncoder::bindPipline (#4148)
Diffstat (limited to 'tools/gfx/d3d12')
| -rw-r--r-- | tools/gfx/d3d12/d3d12-command-encoder.cpp | 4 | ||||
| -rw-r--r-- | tools/gfx/d3d12/d3d12-command-encoder.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/gfx/d3d12/d3d12-command-encoder.cpp b/tools/gfx/d3d12/d3d12-command-encoder.cpp index e4d03193b..b88bf3168 100644 --- a/tools/gfx/d3d12/d3d12-command-encoder.cpp +++ b/tools/gfx/d3d12/d3d12-command-encoder.cpp @@ -1339,10 +1339,10 @@ void RayTracingCommandEncoderImpl::deserializeAccelerationStructure( D3D12_RAYTRACING_ACCELERATION_STRUCTURE_COPY_MODE_DESERIALIZE); } -void RayTracingCommandEncoderImpl::bindPipeline( +Result RayTracingCommandEncoderImpl::bindPipeline( IPipelineState* state, IShaderObject** outRootObject) { - bindPipelineImpl(state, outRootObject); + return bindPipelineImpl(state, outRootObject); } Result RayTracingCommandEncoderImpl::dispatchRays( diff --git a/tools/gfx/d3d12/d3d12-command-encoder.h b/tools/gfx/d3d12/d3d12-command-encoder.h index 0632084cf..034749946 100644 --- a/tools/gfx/d3d12/d3d12-command-encoder.h +++ b/tools/gfx/d3d12/d3d12-command-encoder.h @@ -328,7 +328,7 @@ public: serializeAccelerationStructure(DeviceAddress dest, IAccelerationStructure* source) override; 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 |