Skip to content

Deduplicate CopyBackResource lambda into a function #1323

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
manon-traverse merged 2 commits into from
Jun 23, 2026
Merged

Deduplicate CopyBackResource lambda into a function #1323

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
145a411
Deduplicate CopyBackResource lambda into a function.
manon-traverse Jun 22, 2026
c73269b
Fix casing of copyBackResource function.
manon-traverse Jun 22, 2026
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
91 changes: 37 additions & 54 deletions lib/API/DX/Device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2752,6 +2752,39 @@ class DXDevice : public offloadtest::Device {
return llvm::Error::success();
}

static llvm::Error
copyBackResource(offloadtest::ComputeEncoder &ReadbackEncoder,
ResourcePair &R) {
if (R.first->isTexture()) {
for (const ResourceSet &RS : R.second) {
if (RS.Readback == nullptr)
continue;

if (auto Err =
ReadbackEncoder.copyTextureToBuffer(*RS.Texture, *RS.Readback))
return Err;
}
} else if (R.first->isBuffer()) {
for (const ResourceSet &RS : R.second) {
if (RS.Readback == nullptr)
continue;

if (auto Err = ReadbackEncoder.copyBufferToBuffer(
*RS.Buffer, 0, *RS.Readback, 0, RS.Buffer->getSizeInBytes()))
return Err;

if (!RS.Buffer->getDesc().HasCounter)
continue;

if (auto Err = ReadbackEncoder.copyCounterToBuffer(*RS.Buffer,
*RS.CounterReadback))
return Err;
}
}

return llvm::Error::success();
}

llvm::Error createComputeCommands(Pipeline &P, InvocationState &IS) {
CD3DX12_GPU_DESCRIPTOR_HANDLE Handle;
if (IS.DescHeap) {
Expand Down Expand Up @@ -2866,41 +2899,13 @@ class DXDevice : public offloadtest::Device {
return EncoderOrErr.takeError();
auto ReadbackEncoder = std::move(*EncoderOrErr);

auto CopyBackResource = [&ReadbackEncoder](ResourcePair &R) -> llvm::Error {
if (R.first->isTexture()) {
for (const ResourceSet &RS : R.second) {
if (RS.Readback == nullptr)
continue;
if (auto Err = ReadbackEncoder->copyTextureToBuffer(*RS.Texture,
*RS.Readback))
return Err;
}
} else {
for (const ResourceSet &RS : R.second) {
if (RS.Readback == nullptr)
continue;

if (auto Err = ReadbackEncoder->copyBufferToBuffer(
*RS.Buffer, 0, *RS.Readback, 0,
RS.Readback->getSizeInBytes()))
return Err;

if (RS.Buffer->getDesc().HasCounter)
if (auto Err = ReadbackEncoder->copyCounterToBuffer(
*RS.Buffer, *RS.CounterReadback))
return Err;
}
}
return llvm::Error::success();
};

for (auto &Table : IS.DescTables)
for (auto &R : Table.Resources)
if (auto Err = CopyBackResource(R))
if (auto Err = DXDevice::copyBackResource(*ReadbackEncoder, R))
return Err;

for (auto &R : IS.RootResources)
if (auto Err = CopyBackResource(R))
if (auto Err = DXDevice::copyBackResource(*ReadbackEncoder, R))
return Err;

ReadbackEncoder->endEncoding();
Expand Down Expand Up @@ -3086,35 +3091,13 @@ class DXDevice : public offloadtest::Device {
*IS.RTReadback))
return Err;

auto CopyBackResource = [&ReadbackEncoder](ResourcePair &R) -> llvm::Error {
if (R.first->isTexture()) {
for (const ResourceSet &RS : R.second) {
if (RS.Readback == nullptr)
continue;

if (auto Err = ReadbackEncoder->copyTextureToBuffer(*RS.Texture,
*RS.Readback))
return Err;
}
} else {
for (const ResourceSet &RS : R.second) {
if (RS.Readback != nullptr)
if (auto Err = ReadbackEncoder->copyBufferToBuffer(
*RS.Buffer, 0, *RS.Readback, 0,
RS.Buffer->getSizeInBytes()))
return Err;
}
}
return llvm::Error::success();
};

for (auto &Table : IS.DescTables)
for (auto &R : Table.Resources)
if (auto Err = CopyBackResource(R))
if (auto Err = DXDevice::copyBackResource(*ReadbackEncoder, R))
return Err;

for (auto &R : IS.RootResources)
if (auto Err = CopyBackResource(R))
if (auto Err = DXDevice::copyBackResource(*ReadbackEncoder, R))
return Err;

return llvm::Error::success();
Expand Down
Loading