Skip to content

Commit b58d924

Browse files
bob80905bob80905
committed
address variable casing errors
1 parent eda2715 commit b58d924

File tree

1 file changed

+83
-83
lines changed

1 file changed

+83
-83
lines changed

‎lib/API/DX/Device.cpp‎

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -562,47 +562,47 @@ class DXDevice : public offloadtest::Device {
562562
"Failed to create committed resource (upload buffer)."))
563563
return Err;
564564

565-
// Tile mapping setup (optional if numTiles > 0)
566-
UINT numTiles = static_cast<UINT>(R.TilesMapped);
567-
ComPtr<ID3D12Heap> heap; // optional, only created if numTiles > 0
568-
569-
if (numTiles > 0) {
570-
std::vector<D3D12_TILED_RESOURCE_COORDINATE> startCoords(numTiles);
571-
std::vector<D3D12_TILE_REGION_SIZE> regionSizes(numTiles);
572-
std::vector<D3D12_TILE_RANGE_FLAGS> rangeFlags(
573-
numTiles, D3D12_TILE_RANGE_FLAG_NONE);
574-
std::vector<UINT> heapRangeStartOffsets(numTiles);
575-
std::vector<UINT> rangeTileCounts(numTiles, 1);
576-
577-
// Create a heap large enough for the mapped tiles
578-
D3D12_HEAP_DESC heapDesc = {};
579-
heapDesc.Properties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT);
580-
heapDesc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
581-
heapDesc.SizeInBytes = static_cast<UINT64>(numTiles) *
565+
// Tile mapping setup (optional if NumTiles > 0)
566+
UINT NumTiles = static_cast<UINT>(R.TilesMapped);
567+
ComPtr<ID3D12Heap> Heap; // optional, only created if NumTiles > 0
568+
569+
if (NumTiles > 0) {
570+
std::vector<D3D12_TILED_RESOURCE_COORDINATE> StartCoords(NumTiles);
571+
std::vector<D3D12_TILE_REGION_SIZE> RegionSizes(NumTiles);
572+
std::vector<D3D12_TILE_RANGE_FLAGS> RangeFlags(
573+
NumTiles, D3D12_TILE_RANGE_FLAG_NONE);
574+
std::vector<UINT> HeapRangeStartOffsets(NumTiles);
575+
std::vector<UINT> RangeTileCounts(NumTiles, 1);
576+
577+
// Create a Heap large enough for the mapped tiles
578+
D3D12_HEAP_DESC HeapDesc = {};
579+
HeapDesc.Properties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT);
580+
HeapDesc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
581+
HeapDesc.SizeInBytes = static_cast<UINT64>(NumTiles) *
582582
D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
583-
heapDesc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
583+
HeapDesc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
584584

585585
if (auto Err =
586-
HR::toError(Device->CreateHeap(&heapDesc, IID_PPV_ARGS(&heap)),
586+
HR::toError(Device->CreateHeap(&HeapDesc, IID_PPV_ARGS(&Heap)),
587587
"Failed to create heap for tiled SRV resource."))
588588
return Err;
589589

590590
// Fill tile coordinates and region sizes
591-
for (UINT i = 0; i < numTiles; ++i) {
592-
startCoords[i] = {i, 0, 0, 0};
593-
regionSizes[i].NumTiles = 1;
594-
regionSizes[i].UseBox = FALSE;
595-
heapRangeStartOffsets[i] = i;
591+
for (UINT I = 0; I < NumTiles; ++I) {
592+
StartCoords[I] = {I, 0, 0, 0};
593+
RegionSizes[I].NumTiles = 1;
594+
RegionSizes[I].UseBox = FALSE;
595+
HeapRangeStartOffsets[I] = I;
596596
}
597597

598598
// Retrieve a command queue from InvocationState
599599
ID3D12CommandQueue *CommandQueue = IS.Queue.Get();
600600

601-
// Map the first numTiles tiles in the Buffer
601+
// Map the first NumTiles tiles in the Buffer
602602
CommandQueue->UpdateTileMappings(
603-
Buffer.Get(), numTiles, startCoords.data(), regionSizes.data(),
604-
heap.Get(), numTiles, rangeFlags.data(),
605-
heapRangeStartOffsets.data(), rangeTileCounts.data(),
603+
Buffer.Get(), NumTiles, StartCoords.data(), RegionSizes.data(),
604+
Heap.Get(), NumTiles, RangeFlags.data(),
605+
HeapRangeStartOffsets.data(), RangeTileCounts.data(),
606606
D3D12_TILE_MAPPING_FLAG_NONE);
607607
}
608608

@@ -626,7 +626,7 @@ class DXDevice : public offloadtest::Device {
626626
addResourceUploadCommands(R, IS, Buffer, UploadBuffer);
627627

628628
// Store heap in Bundle so it lives until caller releases the Bundle
629-
Bundle.emplace_back(UploadBuffer, Buffer, nullptr, heap);
629+
Bundle.emplace_back(UploadBuffer, Buffer, nullptr, Heap);
630630
RegOffset++;
631631
}
632632

@@ -775,47 +775,47 @@ class DXDevice : public offloadtest::Device {
775775
"Failed to create committed resource (readback buffer)."))
776776
return Err;
777777

778-
// Tile mapping setup (optional if numTiles > 0)
779-
UINT numTiles = static_cast<UINT>(R.TilesMapped);
780-
ComPtr<ID3D12Heap> heap; // optional, only created if numTiles > 0
778+
// Tile mapping setup (optional if NumTiles > 0)
779+
UINT NumTiles = static_cast<UINT>(R.TilesMapped);
780+
ComPtr<ID3D12Heap> Heap; // optional, only created if NumTiles > 0
781781

782-
if (numTiles > 0) {
783-
std::vector<D3D12_TILED_RESOURCE_COORDINATE> startCoords(numTiles);
784-
std::vector<D3D12_TILE_REGION_SIZE> regionSizes(numTiles);
785-
std::vector<D3D12_TILE_RANGE_FLAGS> rangeFlags(
786-
numTiles, D3D12_TILE_RANGE_FLAG_NONE);
787-
std::vector<UINT> heapRangeStartOffsets(numTiles);
788-
std::vector<UINT> rangeTileCounts(numTiles, 1);
782+
if (NumTiles > 0) {
783+
std::vector<D3D12_TILED_RESOURCE_COORDINATE> StartCoords(NumTiles);
784+
std::vector<D3D12_TILE_REGION_SIZE> RegionSizes(NumTiles);
785+
std::vector<D3D12_TILE_RANGE_FLAGS> RangeFlags(
786+
NumTiles, D3D12_TILE_RANGE_FLAG_NONE);
787+
std::vector<UINT> HeapRangeStartOffsets(NumTiles);
788+
std::vector<UINT> RangeTileCounts(NumTiles, 1);
789789

790790
// Create a heap large enough for the mapped tiles
791-
D3D12_HEAP_DESC heapDesc = {};
792-
heapDesc.Properties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT);
793-
heapDesc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
794-
heapDesc.SizeInBytes = static_cast<UINT64>(numTiles) *
791+
D3D12_HEAP_DESC HeapDesc = {};
792+
HeapDesc.Properties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT);
793+
HeapDesc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
794+
HeapDesc.SizeInBytes = static_cast<UINT64>(NumTiles) *
795795
D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
796-
heapDesc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
796+
HeapDesc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
797797

798798
if (auto Err =
799-
HR::toError(Device->CreateHeap(&heapDesc, IID_PPV_ARGS(&heap)),
799+
HR::toError(Device->CreateHeap(&HeapDesc, IID_PPV_ARGS(&Heap)),
800800
"Failed to create heap for tiled UAV resource."))
801801
return Err;
802802

803803
// Fill tile coordinates and region sizes
804-
for (UINT i = 0; i < numTiles; ++i) {
805-
startCoords[i] = {i, 0, 0, 0};
806-
regionSizes[i].NumTiles = 1;
807-
regionSizes[i].UseBox = FALSE;
808-
heapRangeStartOffsets[i] = i;
804+
for (UINT I = 0; I < NumTiles; ++I) {
805+
StartCoords[I] = {I, 0, 0, 0};
806+
RegionSizes[I].NumTiles = 1;
807+
RegionSizes[I].UseBox = FALSE;
808+
HeapRangeStartOffsets[I] = I;
809809
}
810810

811811
// Retrieve a command queue from InvocationState
812812
ID3D12CommandQueue *CommandQueue = IS.Queue.Get();
813813

814-
// Map the first numTiles tiles in the Buffer
814+
// Map the first NumTiles tiles in the Buffer
815815
CommandQueue->UpdateTileMappings(
816-
Buffer.Get(), numTiles, startCoords.data(), regionSizes.data(),
817-
heap.Get(), numTiles, rangeFlags.data(),
818-
heapRangeStartOffsets.data(), rangeTileCounts.data(),
816+
Buffer.Get(), NumTiles, StartCoords.data(), RegionSizes.data(),
817+
Heap.Get(), NumTiles, RangeFlags.data(),
818+
HeapRangeStartOffsets.data(), RangeTileCounts.data(),
819819
D3D12_TILE_MAPPING_FLAG_NONE);
820820
}
821821

@@ -839,7 +839,7 @@ class DXDevice : public offloadtest::Device {
839839
addResourceUploadCommands(R, IS, Buffer, UploadBuffer);
840840

841841
// Store heap in Bundle so it lives until caller releases the Bundle
842-
Bundle.emplace_back(UploadBuffer, Buffer, ReadBackBuffer, heap);
842+
Bundle.emplace_back(UploadBuffer, Buffer, ReadBackBuffer, Heap);
843843
RegOffset++;
844844
}
845845

@@ -1007,54 +1007,54 @@ class DXDevice : public offloadtest::Device {
10071007
"Failed to create committed resource (upload buffer)."))
10081008
return Err;
10091009

1010-
// Tile mapping setup (optional if numTiles > 0)
1011-
UINT numTiles = static_cast<UINT>(R.TilesMapped);
1012-
ComPtr<ID3D12Heap> heap; // optional, only created if numTiles > 0
1010+
// Tile mapping setup (optional if NumTiles > 0)
1011+
UINT NumTiles = static_cast<UINT>(R.TilesMapped);
1012+
ComPtr<ID3D12Heap> Heap; // optional, only created if NumTiles > 0
10131013

1014-
if (numTiles > 0) {
1015-
std::vector<D3D12_TILED_RESOURCE_COORDINATE> startCoords(numTiles);
1016-
std::vector<D3D12_TILE_REGION_SIZE> regionSizes(numTiles);
1017-
std::vector<D3D12_TILE_RANGE_FLAGS> rangeFlags(
1018-
numTiles, D3D12_TILE_RANGE_FLAG_NONE);
1019-
std::vector<UINT> heapRangeStartOffsets(numTiles);
1020-
std::vector<UINT> rangeTileCounts(numTiles, 1);
1014+
if (NumTiles > 0) {
1015+
std::vector<D3D12_TILED_RESOURCE_COORDINATE> StartCoords(NumTiles);
1016+
std::vector<D3D12_TILE_REGION_SIZE> RegionSizes(NumTiles);
1017+
std::vector<D3D12_TILE_RANGE_FLAGS> RangeFlags(
1018+
NumTiles, D3D12_TILE_RANGE_FLAG_NONE);
1019+
std::vector<UINT> HeapRangeStartOffsets(NumTiles);
1020+
std::vector<UINT> RangeTileCounts(NumTiles, 1);
10211021

10221022
// Create a heap large enough for the mapped tiles
1023-
D3D12_HEAP_DESC heapDesc = {};
1024-
heapDesc.Properties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT);
1025-
heapDesc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
1026-
heapDesc.SizeInBytes = static_cast<UINT64>(numTiles) *
1023+
D3D12_HEAP_DESC HeapDesc = {};
1024+
HeapDesc.Properties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT);
1025+
HeapDesc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
1026+
HeapDesc.SizeInBytes = static_cast<UINT64>(NumTiles) *
10271027
D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
1028-
heapDesc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
1028+
HeapDesc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
10291029

10301030
if (auto Err =
1031-
HR::toError(Device->CreateHeap(&heapDesc, IID_PPV_ARGS(&heap)),
1031+
HR::toError(Device->CreateHeap(&HeapDesc, IID_PPV_ARGS(&Heap)),
10321032
"Failed to create heap for tiled CBV resource."))
10331033
return Err;
10341034

10351035
// Fill tile coordinates and region sizes
1036-
for (UINT i = 0; i < numTiles; ++i) {
1037-
startCoords[i] = {i, 0, 0, 0};
1038-
regionSizes[i].NumTiles = 1;
1039-
regionSizes[i].UseBox = FALSE;
1040-
heapRangeStartOffsets[i] = i;
1036+
for (UINT I = 0; I < NumTiles; ++I) {
1037+
StartCoords[I] = {I, 0, 0, 0};
1038+
RegionSizes[I].NumTiles = 1;
1039+
RegionSizes[I].UseBox = FALSE;
1040+
HeapRangeStartOffsets[I] = I;
10411041
}
10421042

10431043
// Retrieve a command queue from InvocationState
10441044
ID3D12CommandQueue *CommandQueue = IS.Queue.Get();
10451045

1046-
// Map the first numTiles tiles in the Buffer
1046+
// Map the first NumTiles tiles in the Buffer
10471047
CommandQueue->UpdateTileMappings(
1048-
Buffer.Get(), numTiles, startCoords.data(), regionSizes.data(),
1049-
heap.Get(), numTiles, rangeFlags.data(),
1050-
heapRangeStartOffsets.data(), rangeTileCounts.data(),
1048+
Buffer.Get(), NumTiles, StartCoords.data(), RegionSizes.data(),
1049+
Heap.Get(), NumTiles, RangeFlags.data(),
1050+
HeapRangeStartOffsets.data(), RangeTileCounts.data(),
10511051
D3D12_TILE_MAPPING_FLAG_NONE);
10521052
}
10531053

10541054
// Upload data initialization
10551055
void *ResDataPtr = nullptr;
1056-
D3D12_RANGE range = {0, 0}; // no reads expected
1057-
if (SUCCEEDED(UploadBuffer->Map(0, &range, &ResDataPtr))) {
1056+
D3D12_RANGE Range = {0, 0}; // no reads expected
1057+
if (SUCCEEDED(UploadBuffer->Map(0, &Range, &ResDataPtr))) {
10581058
memcpy(ResDataPtr, ResData.get(), R.size());
10591059
// Zero remaining bytes if the buffer is padded
10601060
if (R.size() < BufferSize) {
@@ -1071,7 +1071,7 @@ class DXDevice : public offloadtest::Device {
10711071
addResourceUploadCommands(R, IS, Buffer, UploadBuffer);
10721072

10731073
// Store resource bundle (heap optional)
1074-
Bundle.emplace_back(UploadBuffer, Buffer, nullptr, heap);
1074+
Bundle.emplace_back(UploadBuffer, Buffer, nullptr, Heap);
10751075
RegOffset++;
10761076
}
10771077

0 commit comments

Comments
 (0)