Skip to content

Commit 2d6924c

Browse files
committed
pr feedback: rename functions and remove comments
1 parent 250afe4 commit 2d6924c

5 files changed

Lines changed: 14 additions & 14 deletions

File tree

include/API/Device.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ initializeDevices(const DeviceConfig Config);
9090
// CPUBuffer. Does not upload the buffer's data — only uses its description to
9191
// configure the texture.
9292
llvm::Expected<std::shared_ptr<Texture>>
93-
createRenderTarget(Device &Dev, const CPUBuffer &Buf);
93+
createRenderTargetFromCPUBuffer(Device &Dev, const CPUBuffer &Buf);
9494

9595
// Creates a depth/stencil texture matching the dimensions of a render target.
9696
llvm::Expected<std::shared_ptr<Texture>>
97-
createDepthStencil(Device &Dev, uint32_t Width, uint32_t Height);
97+
createDefaultDepthStencilTarget(Device &Dev, uint32_t Width, uint32_t Height);
9898

9999
} // namespace offloadtest
100100

lib/API/DX/Device.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,8 @@ class DXDevice : public offloadtest::Device {
437437

438438
D3D12_RESOURCE_DESC TexDesc = {};
439439
TexDesc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
440-
TexDesc.Width = Desc.Width, TexDesc.Height = Desc.Height,
440+
TexDesc.Width = Desc.Width;
441+
TexDesc.Height = Desc.Height;
441442
TexDesc.DepthOrArraySize = 1;
442443
TexDesc.MipLevels = static_cast<UINT16>(Desc.MipLevels);
443444
TexDesc.Format = getDXGIFormat(Desc.Format);
@@ -1499,7 +1500,7 @@ class DXDevice : public offloadtest::Device {
14991500
"No render target bound for graphics pipeline.");
15001501
const CPUBuffer &OutBuf = *P.Bindings.RTargetBufferPtr;
15011502

1502-
auto TexOrErr = offloadtest::createRenderTarget(*this, OutBuf);
1503+
auto TexOrErr = offloadtest::createRenderTargetFromCPUBuffer(*this, OutBuf);
15031504
if (!TexOrErr)
15041505
return TexOrErr.takeError();
15051506

@@ -1517,7 +1518,7 @@ class DXDevice : public offloadtest::Device {
15171518
}
15181519

15191520
llvm::Error createDepthStencil(Pipeline &P, InvocationState &IS) {
1520-
auto TexOrErr = offloadtest::createDepthStencil(
1521+
auto TexOrErr = offloadtest::createDefaultDepthStencilTarget(
15211522
*this, P.Bindings.RTargetBufferPtr->OutputProps.Width,
15221523
P.Bindings.RTargetBufferPtr->OutputProps.Height);
15231524
if (!TexOrErr)

lib/API/Device.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ offloadtest::initializeDevices(const DeviceConfig Config) {
4848
}
4949

5050
llvm::Expected<std::shared_ptr<Texture>>
51-
offloadtest::createRenderTarget(Device &Dev, const CPUBuffer &Buf) {
51+
offloadtest::createRenderTargetFromCPUBuffer(Device &Dev,
52+
const CPUBuffer &Buf) {
5253
auto TexFmtOrErr = toFormat(Buf.Format, Buf.Channels);
5354
if (!TexFmtOrErr)
5455
return TexFmtOrErr.takeError();
@@ -69,7 +70,8 @@ offloadtest::createRenderTarget(Device &Dev, const CPUBuffer &Buf) {
6970
}
7071

7172
llvm::Expected<std::shared_ptr<Texture>>
72-
offloadtest::createDepthStencil(Device &Dev, uint32_t Width, uint32_t Height) {
73+
offloadtest::createDefaultDepthStencilTarget(Device &Dev, uint32_t Width,
74+
uint32_t Height) {
7375
TextureCreateDesc Desc = {};
7476
Desc.Location = MemoryLocation::GpuOnly;
7577
Desc.Usage = TextureUsage::DepthStencil;

lib/API/MTL/MTLDevice.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ class MTLDevice : public offloadtest::Device {
466466
"No render target bound for graphics pipeline.");
467467
const CPUBuffer &OutBuf = *P.Bindings.RTargetBufferPtr;
468468

469-
auto TexOrErr = offloadtest::createRenderTarget(*this, OutBuf);
469+
auto TexOrErr = offloadtest::createRenderTargetFromCPUBuffer(*this, OutBuf);
470470
if (!TexOrErr)
471471
return TexOrErr.takeError();
472472

@@ -484,7 +484,7 @@ class MTLDevice : public offloadtest::Device {
484484
}
485485

486486
llvm::Error createDepthStencil(Pipeline &P, InvocationState &IS) {
487-
auto TexOrErr = offloadtest::createDepthStencil(
487+
auto TexOrErr = offloadtest::createDefaultDepthStencilTarget(
488488
*this, P.Bindings.RTargetBufferPtr->OutputProps.Width,
489489
P.Bindings.RTargetBufferPtr->OutputProps.Height);
490490
if (!TexOrErr)

lib/API/VK/Device.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,7 +1137,7 @@ class VulkanDevice : public offloadtest::Device {
11371137
"No render target bound for graphics pipeline.");
11381138
const CPUBuffer &RTBuf = *P.Bindings.RTargetBufferPtr;
11391139

1140-
auto TexOrErr = offloadtest::createRenderTarget(*this, RTBuf);
1140+
auto TexOrErr = offloadtest::createRenderTargetFromCPUBuffer(*this, RTBuf);
11411141
if (!TexOrErr)
11421142
return TexOrErr.takeError();
11431143

@@ -1155,7 +1155,7 @@ class VulkanDevice : public offloadtest::Device {
11551155
}
11561156

11571157
llvm::Error createDepthStencil(Pipeline &P, InvocationState &IS) {
1158-
auto TexOrErr = offloadtest::createDepthStencil(
1158+
auto TexOrErr = offloadtest::createDefaultDepthStencilTarget(
11591159
*this, P.Bindings.RTargetBufferPtr->OutputProps.Width,
11601160
P.Bindings.RTargetBufferPtr->OutputProps.Height);
11611161
if (!TexOrErr)
@@ -2377,9 +2377,6 @@ class VulkanDevice : public offloadtest::Device {
23772377
vkDestroyBuffer(Device, IS.VertexBuffer->Host.Buffer, nullptr);
23782378
vkFreeMemory(Device, IS.VertexBuffer->Host.Memory, nullptr);
23792379
}
2380-
// Render target image and readback buffer are owned by
2381-
// Render target, readback buffer, and depth stencil are owned by
2382-
// shared_ptrs (IS.RenderTarget, IS.RTReadback, IS.DepthStencil).
23832380
vkDestroyFramebuffer(Device, IS.FrameBuffer, nullptr);
23842381
vkDestroyRenderPass(Device, IS.RenderPass, nullptr);
23852382
}

0 commit comments

Comments
 (0)