diff options
| author | Yong He <yonghe@outlook.com> | 2023-02-06 14:34:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-06 14:34:19 -0800 |
| commit | 5ede9a3b739a62a46fa408b19e12cf3f72730f1d (patch) | |
| tree | 676b5c23b867b6ad94117c547befe65ffa6548ba /tools/gfx/debug-layer | |
| parent | e893a831d7f64eb52e76df087190247f43b150ae (diff) | |
GFX: make dispatch commands return error code. (#2625)
* GFX: make dispatch commands return error code.
* Fix cuda.
---------
Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'tools/gfx/debug-layer')
| -rw-r--r-- | tools/gfx/debug-layer/debug-command-encoder.cpp | 32 | ||||
| -rw-r--r-- | tools/gfx/debug-layer/debug-command-encoder.h | 18 |
2 files changed, 25 insertions, 25 deletions
diff --git a/tools/gfx/debug-layer/debug-command-encoder.cpp b/tools/gfx/debug-layer/debug-command-encoder.cpp index 64ebd2b46..3ddd6401f 100644 --- a/tools/gfx/debug-layer/debug-command-encoder.cpp +++ b/tools/gfx/debug-layer/debug-command-encoder.cpp @@ -46,17 +46,17 @@ Result DebugComputeCommandEncoder::bindPipelineWithRootObject( return baseObject->bindPipelineWithRootObject(getInnerObj(state), getInnerObj(rootObject)); } -void DebugComputeCommandEncoder::dispatchCompute(int x, int y, int z) +Result DebugComputeCommandEncoder::dispatchCompute(int x, int y, int z) { SLANG_GFX_API_FUNC; - baseObject->dispatchCompute(x, y, z); + return baseObject->dispatchCompute(x, y, z); } -void DebugComputeCommandEncoder::dispatchComputeIndirect( +Result DebugComputeCommandEncoder::dispatchComputeIndirect( IBufferResource* cmdBuffer, Offset offset) { SLANG_GFX_API_FUNC; - baseObject->dispatchComputeIndirect(getInnerObj(cmdBuffer), offset); + return baseObject->dispatchComputeIndirect(getInnerObj(cmdBuffer), offset); } void DebugRenderCommandEncoder::endEncoding() @@ -130,20 +130,20 @@ void DebugRenderCommandEncoder::setIndexBuffer( baseObject->setIndexBuffer(innerBuffer, indexFormat, offset); } -void DebugRenderCommandEncoder::draw(GfxCount vertexCount, GfxIndex startVertex) +Result DebugRenderCommandEncoder::draw(GfxCount vertexCount, GfxIndex startVertex) { SLANG_GFX_API_FUNC; - baseObject->draw(vertexCount, startVertex); + return baseObject->draw(vertexCount, startVertex); } -void DebugRenderCommandEncoder::drawIndexed( +Result DebugRenderCommandEncoder::drawIndexed( GfxCount indexCount, GfxIndex startIndex, GfxIndex baseVertex) { SLANG_GFX_API_FUNC; - baseObject->drawIndexed(indexCount, startIndex, baseVertex); + return baseObject->drawIndexed(indexCount, startIndex, baseVertex); } -void DebugRenderCommandEncoder::drawIndirect( +Result DebugRenderCommandEncoder::drawIndirect( GfxCount maxDrawCount, IBufferResource* argBuffer, Offset argOffset, @@ -151,11 +151,11 @@ void DebugRenderCommandEncoder::drawIndirect( Offset countOffset) { SLANG_GFX_API_FUNC; - baseObject->drawIndirect( + return baseObject->drawIndirect( maxDrawCount, getInnerObj(argBuffer), argOffset, getInnerObj(countBuffer), countOffset); } -void DebugRenderCommandEncoder::drawIndexedIndirect( +Result DebugRenderCommandEncoder::drawIndexedIndirect( GfxCount maxDrawCount, IBufferResource* argBuffer, Offset argOffset, @@ -163,7 +163,7 @@ void DebugRenderCommandEncoder::drawIndexedIndirect( Offset countOffset) { SLANG_GFX_API_FUNC; - baseObject->drawIndexedIndirect( + return baseObject->drawIndexedIndirect( maxDrawCount, getInnerObj(argBuffer), argOffset, getInnerObj(countBuffer), countOffset); } @@ -180,7 +180,7 @@ Result DebugRenderCommandEncoder::setSamplePositions( return baseObject->setSamplePositions(samplesPerPixel, pixelCount, samplePositions); } -void DebugRenderCommandEncoder::drawInstanced( +Result DebugRenderCommandEncoder::drawInstanced( GfxCount vertexCount, GfxCount instanceCount, GfxIndex startVertex, @@ -191,7 +191,7 @@ void DebugRenderCommandEncoder::drawInstanced( vertexCount, instanceCount, startVertex, startInstanceLocation); } -void DebugRenderCommandEncoder::drawIndexedInstanced( +Result DebugRenderCommandEncoder::drawIndexedInstanced( GfxCount indexCount, GfxCount instanceCount, GfxIndex startIndexLocation, @@ -483,7 +483,7 @@ Result DebugRayTracingCommandEncoder::bindPipelineWithRootObject( return baseObject->bindPipelineWithRootObject(getInnerObj(state), getInnerObj(rootObject)); } -void DebugRayTracingCommandEncoder::dispatchRays( +Result DebugRayTracingCommandEncoder::dispatchRays( GfxIndex rayGenShaderIndex, IShaderTable* shaderTable, GfxCount width, @@ -491,7 +491,7 @@ void DebugRayTracingCommandEncoder::dispatchRays( GfxCount depth) { SLANG_GFX_API_FUNC; - baseObject->dispatchRays(rayGenShaderIndex, getInnerObj(shaderTable), width, height, depth); + return baseObject->dispatchRays(rayGenShaderIndex, getInnerObj(shaderTable), width, height, depth); } } // namespace debug diff --git a/tools/gfx/debug-layer/debug-command-encoder.h b/tools/gfx/debug-layer/debug-command-encoder.h index b53a11074..395db587e 100644 --- a/tools/gfx/debug-layer/debug-command-encoder.h +++ b/tools/gfx/debug-layer/debug-command-encoder.h @@ -123,8 +123,8 @@ public: bindPipeline(IPipelineState* state, IShaderObject** outRootShaderObject) override; virtual SLANG_NO_THROW Result SLANG_MCALL bindPipelineWithRootObject(IPipelineState* state, IShaderObject* rootObject) override; - virtual SLANG_NO_THROW void SLANG_MCALL dispatchCompute(int x, int y, int z) override; - virtual SLANG_NO_THROW void SLANG_MCALL + virtual SLANG_NO_THROW Result SLANG_MCALL dispatchCompute(int x, int y, int z) override; + virtual SLANG_NO_THROW Result SLANG_MCALL dispatchComputeIndirect(IBufferResource* cmdBuffer, Offset offset) override; public: @@ -197,17 +197,17 @@ public: const Offset* offsets) override; virtual SLANG_NO_THROW void SLANG_MCALL setIndexBuffer(IBufferResource* buffer, Format indexFormat, Offset offset = 0) override; - virtual SLANG_NO_THROW void SLANG_MCALL + virtual SLANG_NO_THROW Result SLANG_MCALL draw(GfxCount vertexCount, GfxIndex startVertex = 0) override; - virtual SLANG_NO_THROW void SLANG_MCALL + virtual SLANG_NO_THROW Result SLANG_MCALL drawIndexed(GfxCount indexCount, GfxIndex startIndex = 0, GfxIndex baseVertex = 0) override; - virtual SLANG_NO_THROW void SLANG_MCALL drawIndirect( + virtual SLANG_NO_THROW Result SLANG_MCALL drawIndirect( GfxCount maxDrawCount, IBufferResource* argBuffer, Offset argOffset, IBufferResource* countBuffer, Offset countOffset) override; - virtual SLANG_NO_THROW void SLANG_MCALL drawIndexedIndirect( + virtual SLANG_NO_THROW Result SLANG_MCALL drawIndexedIndirect( GfxCount maxDrawCount, IBufferResource* argBuffer, Offset argOffset, @@ -218,13 +218,13 @@ public: GfxCount samplesPerPixel, GfxCount pixelCount, const SamplePosition* samplePositions) override; - virtual SLANG_NO_THROW void SLANG_MCALL drawInstanced( + virtual SLANG_NO_THROW Result SLANG_MCALL drawInstanced( GfxCount vertexCount, GfxCount instanceCount, GfxIndex startVertex, GfxIndex startInstanceLocation) override; - virtual SLANG_NO_THROW void SLANG_MCALL drawIndexedInstanced( + virtual SLANG_NO_THROW Result SLANG_MCALL drawIndexedInstanced( GfxCount indexCount, GfxCount instanceCount, GfxIndex startIndexLocation, @@ -277,7 +277,7 @@ public: bindPipeline(IPipelineState* state, IShaderObject** outRootObject) override; virtual SLANG_NO_THROW Result SLANG_MCALL bindPipelineWithRootObject(IPipelineState* state, IShaderObject* rootObject) override; - virtual SLANG_NO_THROW void SLANG_MCALL dispatchRays( + virtual SLANG_NO_THROW Result SLANG_MCALL dispatchRays( GfxIndex rayGenShaderIndex, IShaderTable* shaderTable, GfxCount width, |
