fix oparraylength for DX12

Try · Jun 4, 2023 · 9fc1cfe · 9fc1cfe
1 parent 571ebe4
commit 9fc1cfe
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/Engine/gapi/directx12/dxallocator.cpp b/Engine/gapi/directx12/dxallocator.cpp
@@ -140,7 +140,7 @@ DxBuffer DxAllocator::alloc(const void* mem, size_t count, size_t size, size_t a
     state          = D3D12_RESOURCE_STATE_UNORDERED_ACCESS;
     }
 
-  DxBuffer ret(owner,UINT(resDesc.Width));
+  DxBuffer ret(owner,UINT(resDesc.Width), UINT(count*alignedSz));
   ret.page = allocator.alloc(count*alignedSz, toAlignment(bufFlg),
                              uint32_t(bufFlg), uint32_t(bufFlg), (bufFlg!=BufferHeap::Device));
   if(!ret.page.page)

diff --git a/Engine/gapi/directx12/dxbuffer.cpp b/Engine/gapi/directx12/dxbuffer.cpp
@@ -9,12 +9,13 @@
 using namespace Tempest;
 using namespace Tempest::Detail;
 
-DxBuffer::DxBuffer(DxDevice* dev, UINT sizeInBytes)
-  :dev(dev), sizeInBytes(sizeInBytes) {
+DxBuffer::DxBuffer(DxDevice* dev, UINT sizeInBytes, UINT appSize)
+  :dev(dev), sizeInBytes(sizeInBytes), appSize(appSize) {
   }
 
 DxBuffer::DxBuffer(DxBuffer&& other)
-  :dev(other.dev), page(std::move(other.page)), impl(std::move(other.impl)), nonUniqId(other.nonUniqId), sizeInBytes(other.sizeInBytes) {
+  :dev(other.dev), page(std::move(other.page)), impl(std::move(other.impl)), nonUniqId(other.nonUniqId),
+    sizeInBytes(other.sizeInBytes), appSize(other.appSize) {
   other.sizeInBytes = 0;
   other.page.page   = nullptr;
   }
@@ -30,6 +31,7 @@ DxBuffer& DxBuffer::operator=(DxBuffer&& other) {
   std::swap(impl,        other.impl);
   std::swap(nonUniqId,   other.nonUniqId);
   std::swap(sizeInBytes, other.sizeInBytes);
+  std::swap(appSize,     other.appSize);
   return *this;
   }
 

diff --git a/Engine/gapi/directx12/dxbuffer.h b/Engine/gapi/directx12/dxbuffer.h
@@ -13,7 +13,7 @@ class DxDevice;
 class DxBuffer : public AbstractGraphicsApi::Buffer {
   public:
     DxBuffer() = default;
-    DxBuffer(DxDevice* dev, UINT sizeInBytes);
+    DxBuffer(DxDevice* dev, UINT sizeInBytes, UINT appSize);
     DxBuffer(DxBuffer&& other);
     ~DxBuffer();
 
@@ -30,6 +30,7 @@ class DxBuffer : public AbstractGraphicsApi::Buffer {
     ComPtr<ID3D12Resource>  impl;
     NonUniqResId            nonUniqId   = NonUniqResId::I_None;
     UINT                    sizeInBytes = 0;
+    UINT                    appSize     = 0;
 
   protected:
     void  updateByStaging(DxBuffer* stage, const void* data, size_t offDst, size_t offSrc, size_t count, size_t sz, size_t alignedSz);

diff --git a/Engine/gapi/directx12/dxdescriptorarray.cpp b/Engine/gapi/directx12/dxdescriptorarray.cpp
@@ -568,7 +568,7 @@ void DxDescriptorArray::placeInHeap(ID3D12Device& device, D3D12_DESCRIPTOR_RANGE
     desc.Buffer.NumElements  = UINT((byteSize+3)/4); // UAV size is required to be 4-byte aligned.
     desc.Buffer.Flags        = D3D12_BUFFER_UAV_FLAG_RAW;
     if(desc.Buffer.NumElements==0)
-      desc.Buffer.NumElements = UINT(buf.sizeInBytes-bufOffset)/4;
+      desc.Buffer.NumElements = UINT(buf.appSize-bufOffset+3)/4;
 
     auto gpu = at;
     gpu.ptr += heapOffset;
@@ -583,7 +583,7 @@ void DxDescriptorArray::placeInHeap(ID3D12Device& device, D3D12_DESCRIPTOR_RANGE
     desc.Buffer.NumElements      = UINT((byteSize+3)/4); // SRV size is required to be 4-byte aligned.
     desc.Buffer.Flags            = D3D12_BUFFER_SRV_FLAG_RAW;
     if(desc.Buffer.NumElements==0)
-      desc.Buffer.NumElements = UINT(buf.sizeInBytes-bufOffset)/4;
+      desc.Buffer.NumElements = UINT(buf.appSize-bufOffset+3)/4;
 
     auto gpu = at;
     gpu.ptr += heapOffset;