diff options
| author | lucy96chen <47800040+lucy96chen@users.noreply.github.com> | 2022-04-21 12:59:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-21 12:59:09 -0700 |
| commit | f493d24c70a6227754296439e97adf35ec412496 (patch) | |
| tree | 25fffb03c067477bef68ccdc66865683159e3ab5 /tools/gfx/command-encoder-com-forward.h | |
| parent | 1b6cea2219307f6271e131c43d6e8f48910bd435 (diff) | |
GFX renaming work part 2: slang-gfx.h renames (#2194)
* Fixed all build errors and type conversion warnings from renames in slang-gfx.h
* Made necessary build fixes to the CUDA implementation
* Renamed ITextureResource::Size to ITextureResource::Extents
* More rename changes based on CI errors
* More renames to fix CI build errors
* Rerun tests
Diffstat (limited to 'tools/gfx/command-encoder-com-forward.h')
| -rw-r--r-- | tools/gfx/command-encoder-com-forward.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/tools/gfx/command-encoder-com-forward.h b/tools/gfx/command-encoder-com-forward.h index 8f69c6063..50539cba1 100644 --- a/tools/gfx/command-encoder-com-forward.h +++ b/tools/gfx/command-encoder-com-forward.h @@ -3,10 +3,10 @@ #define SLANG_GFX_FORWARD_RESOURCE_COMMAND_ENCODER_IMPL(ResourceCommandEncoderBase) \ virtual SLANG_NO_THROW void SLANG_MCALL copyBuffer( \ IBufferResource* dst, \ - size_t dstOffset, \ + Offset dstOffset, \ IBufferResource* src, \ - size_t srcOffset, \ - size_t size) override \ + Offset srcOffset, \ + Size size) override \ { \ ResourceCommandEncoderBase::copyBuffer(dst, dstOffset, src, srcOffset, size); \ } \ @@ -19,7 +19,7 @@ ResourceState srcState, \ SubresourceRange srcSubresource, \ ITextureResource::Offset3D srcOffset, \ - ITextureResource::Size extent) override \ + ITextureResource::Extents extent) override \ { \ ResourceCommandEncoderBase::copyTexture( \ dst, \ @@ -34,14 +34,14 @@ } \ virtual SLANG_NO_THROW void SLANG_MCALL copyTextureToBuffer( \ IBufferResource* dst, \ - size_t dstOffset, \ - size_t dstSize, \ - size_t dstRowStride, \ + Offset dstOffset, \ + Size dstSize, \ + Size dstRowStride, \ ITextureResource* src, \ ResourceState srcState, \ SubresourceRange srcSubresource, \ ITextureResource::Offset3D srcOffset, \ - ITextureResource::Size extent) override \ + ITextureResource::Extents extent) override \ { \ ResourceCommandEncoderBase::copyTextureToBuffer( \ dst, dstOffset, dstSize, dstRowStride, src, srcState, srcSubresource, srcOffset, extent); \ @@ -50,20 +50,20 @@ ITextureResource* dst, \ SubresourceRange subResourceRange, \ ITextureResource::Offset3D offset, \ - ITextureResource::Size extent, \ + ITextureResource::Extents extent, \ ITextureResource::SubresourceData* subResourceData, \ - size_t subResourceDataCount) override \ + GfxCount subResourceDataCount) override \ { \ ResourceCommandEncoderBase::uploadTextureData( \ dst, subResourceRange, offset, extent, subResourceData, subResourceDataCount); \ } \ virtual SLANG_NO_THROW void SLANG_MCALL uploadBufferData( \ - IBufferResource* dst, size_t offset, size_t size, void* data) override \ + IBufferResource* dst, Offset offset, Size size, void* data) override \ { \ ResourceCommandEncoderBase::uploadBufferData(dst, offset, size, data); \ } \ virtual SLANG_NO_THROW void SLANG_MCALL textureBarrier( \ - size_t count, ITextureResource* const* textures, ResourceState src, ResourceState dst) \ + GfxCount count, ITextureResource* const* textures, ResourceState src, ResourceState dst) \ override \ { \ ResourceCommandEncoderBase::textureBarrier(count, textures, src, dst); \ @@ -78,7 +78,7 @@ texture, subresourceRange, src, dst); \ } \ virtual SLANG_NO_THROW void SLANG_MCALL bufferBarrier( \ - size_t count, IBufferResource* const* buffers, ResourceState src, ResourceState dst) \ + GfxCount count, IBufferResource* const* buffers, ResourceState src, ResourceState dst) \ override \ { \ ResourceCommandEncoderBase::bufferBarrier(count, buffers, src, dst); \ @@ -101,14 +101,14 @@ } \ virtual SLANG_NO_THROW void SLANG_MCALL resolveQuery( \ IQueryPool* queryPool, \ - uint32_t index, \ - uint32_t count, \ + GfxIndex index, \ + GfxCount count, \ IBufferResource* buffer, \ - uint64_t offset) override \ + Offset offset) override \ { \ ResourceCommandEncoderBase::resolveQuery(queryPool, index, count, buffer, offset); \ } \ - virtual SLANG_NO_THROW void SLANG_MCALL writeTimestamp(IQueryPool* pool, SlangInt index) \ + virtual SLANG_NO_THROW void SLANG_MCALL writeTimestamp(IQueryPool* pool, GfxIndex index) \ override \ { \ ResourceCommandEncoderBase::writeTimestamp(pool, index); \ |