File tree 8 files changed +12
-11
lines changed
8 files changed +12
-11
lines changed Original file line number Diff line number Diff line change @@ -1842,7 +1842,7 @@ class IRayTracingCommandEncoder : public IResourceCommandEncoder
1842
1842
virtual SLANG_NO_THROW void SLANG_MCALL
1843
1843
deserializeAccelerationStructure (IAccelerationStructure* dest, DeviceAddress source) = 0 ;
1844
1844
1845
- virtual SLANG_NO_THROW void SLANG_MCALL
1845
+ virtual SLANG_NO_THROW Result SLANG_MCALL
1846
1846
bindPipeline (IPipelineState* state, IShaderObject** outRootObject) = 0 ;
1847
1847
// Sets the current pipeline state along with a pre-created mutable root shader object.
1848
1848
virtual SLANG_NO_THROW Result SLANG_MCALL
Original file line number Diff line number Diff line change @@ -1339,10 +1339,10 @@ void RayTracingCommandEncoderImpl::deserializeAccelerationStructure(
1339
1339
D3D12_RAYTRACING_ACCELERATION_STRUCTURE_COPY_MODE_DESERIALIZE);
1340
1340
}
1341
1341
1342
- void RayTracingCommandEncoderImpl::bindPipeline (
1342
+ Result RayTracingCommandEncoderImpl::bindPipeline (
1343
1343
IPipelineState* state, IShaderObject** outRootObject)
1344
1344
{
1345
- bindPipelineImpl (state, outRootObject);
1345
+ return bindPipelineImpl (state, outRootObject);
1346
1346
}
1347
1347
1348
1348
Result RayTracingCommandEncoderImpl::dispatchRays (
Original file line number Diff line number Diff line change @@ -328,7 +328,7 @@ class RayTracingCommandEncoderImpl
328
328
serializeAccelerationStructure (DeviceAddress dest, IAccelerationStructure* source) override ;
329
329
virtual SLANG_NO_THROW void SLANG_MCALL deserializeAccelerationStructure (
330
330
IAccelerationStructure* dest, DeviceAddress source) override ;
331
- virtual SLANG_NO_THROW void SLANG_MCALL
331
+ virtual SLANG_NO_THROW Result SLANG_MCALL
332
332
bindPipeline (IPipelineState* state, IShaderObject** outRootObject) override ;
333
333
virtual SLANG_NO_THROW Result SLANG_MCALL
334
334
bindPipelineWithRootObject (IPipelineState* state, IShaderObject* rootObject) override
Original file line number Diff line number Diff line change @@ -470,16 +470,17 @@ void DebugRayTracingCommandEncoder::deserializeAccelerationStructure(
470
470
baseObject->deserializeAccelerationStructure (getInnerObj (dest), source);
471
471
}
472
472
473
- void DebugRayTracingCommandEncoder::bindPipeline (
473
+ Result DebugRayTracingCommandEncoder::bindPipeline (
474
474
IPipelineState* state, IShaderObject** outRootObject)
475
475
{
476
476
SLANG_GFX_API_FUNC;
477
477
auto innerPipeline = getInnerObj (state);
478
478
IShaderObject* innerRootObject = nullptr ;
479
479
commandBuffer->rootObject .reset ();
480
- baseObject->bindPipeline (innerPipeline, &innerRootObject);
480
+ Result result = baseObject->bindPipeline (innerPipeline, &innerRootObject);
481
481
commandBuffer->rootObject .baseObject .attach (innerRootObject);
482
482
*outRootObject = &commandBuffer->rootObject ;
483
+ return result;
483
484
}
484
485
485
486
Result DebugRayTracingCommandEncoder::bindPipelineWithRootObject (
Original file line number Diff line number Diff line change @@ -276,7 +276,7 @@ class DebugRayTracingCommandEncoder
276
276
virtual SLANG_NO_THROW void SLANG_MCALL deserializeAccelerationStructure (
277
277
IAccelerationStructure* dest,
278
278
DeviceAddress source) override ;
279
- virtual SLANG_NO_THROW void SLANG_MCALL
279
+ virtual SLANG_NO_THROW Result SLANG_MCALL
280
280
bindPipeline (IPipelineState* state, IShaderObject** outRootObject) override ;
281
281
virtual SLANG_NO_THROW Result SLANG_MCALL
282
282
bindPipelineWithRootObject (IPipelineState* state, IShaderObject* rootObject) override ;
Original file line number Diff line number Diff line change @@ -1519,7 +1519,7 @@ public interface IRayTracingCommandEncoder : IResourceCommandEncoder
1519
1519
public void serializeAccelerationStructure(DeviceAddress dest, IAccelerationStructure source);
1520
1520
public void deserializeAccelerationStructure(IAccelerationStructure dest, DeviceAddress source);
1521
1521
1522
- public void bindPipeline(IPipelineState state, out IShaderObject rootObject);
1522
+ public Result bindPipeline(IPipelineState state, out IShaderObject rootObject);
1523
1523
// Sets the current pipeline state along with a pre-created mutable root shader object.
1524
1524
public Result bindPipelineWithRootObject(IPipelineState state, IShaderObject rootObject);
1525
1525
Original file line number Diff line number Diff line change @@ -1443,9 +1443,9 @@ void RayTracingCommandEncoder::deserializeAccelerationStructure(
1443
1443
m_commandBuffer->m_commandBuffer , ©Info);
1444
1444
}
1445
1445
1446
- void RayTracingCommandEncoder::bindPipeline (IPipelineState* pipeline, IShaderObject** outRootObject)
1446
+ Result RayTracingCommandEncoder::bindPipeline (IPipelineState* pipeline, IShaderObject** outRootObject)
1447
1447
{
1448
- setPipelineStateImpl (pipeline, outRootObject);
1448
+ return setPipelineStateImpl (pipeline, outRootObject);
1449
1449
}
1450
1450
1451
1451
Result RayTracingCommandEncoder::bindPipelineWithRootObject (
Original file line number Diff line number Diff line change @@ -336,7 +336,7 @@ class RayTracingCommandEncoder
336
336
virtual SLANG_NO_THROW void SLANG_MCALL deserializeAccelerationStructure (
337
337
IAccelerationStructure* dest, DeviceAddress source) override ;
338
338
339
- virtual SLANG_NO_THROW void SLANG_MCALL
339
+ virtual SLANG_NO_THROW Result SLANG_MCALL
340
340
bindPipeline (IPipelineState* pipeline, IShaderObject** outRootObject) override ;
341
341
342
342
virtual SLANG_NO_THROW Result SLANG_MCALL bindPipelineWithRootObject (
You can’t perform that action at this time.
0 commit comments