Skip to content

Autodesk: Vulkan Bugfix - HgiVulkanBlitCmds offset #3382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clach merged 1 commit into from
Nov 14, 2024
Merged

Autodesk: Vulkan Bugfix - HgiVulkanBlitCmds offset #3382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions pxr/imaging/hgiVulkan/blitCmds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,23 +283,25 @@ void HgiVulkanBlitCmds::CopyBufferCpuToGpu(
if (!buffer->IsCPUStagingAddress(copyOp.cpuSourceBuffer) ||
copyOp.sourceByteOffset != copyOp.destinationByteOffset) {

uint8_t* dst = static_cast<uint8_t*>(buffer->GetCPUStagingAddress());
size_t dstOffset = copyOp.destinationByteOffset;

// Offset into the src buffer
uint8_t* src = ((uint8_t*) copyOp.cpuSourceBuffer) +
const uint8_t* src = static_cast<const uint8_t*>(copyOp.cpuSourceBuffer) +
copyOp.sourceByteOffset;

// Offset into the dst buffer
memcpy(dst + dstOffset, src, copyOp.byteSize);
// Offset into the dst buffer.
uint8_t* dst = static_cast<uint8_t*>(buffer->GetCPUStagingAddress()) +
copyOp.destinationByteOffset;

memcpy(dst, src, copyOp.byteSize);
}

// Schedule copy data from staging buffer to device-local buffer.
HgiVulkanBuffer* stagingBuffer = buffer->GetStagingBuffer();

if (TF_VERIFY(stagingBuffer)) {
VkBufferCopy copyRegion = {};
copyRegion.srcOffset = copyOp.sourceByteOffset;
// Note we use the destinationByteOffset as the srcOffset here. The staging buffer
// should be prepared with the same data layout of the destination buffer.
copyRegion.srcOffset = copyOp.destinationByteOffset;
copyRegion.dstOffset = copyOp.destinationByteOffset;
copyRegion.size = copyOp.byteSize;

Expand Down