Skip to content

Commit b502404

Browse files
author
kevyuu
committed
Remove unecessary raygenGroupStride parameter.
1 parent 1db0c8f commit b502404

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎include/nbl/video/IGPUCommandBuffer.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -526,13 +526,13 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
526526

527527
bool IGPUCommandBuffer::setRayTracingPipelineStackSize(uint32_t pipelineStackSize);
528528
bool IGPUCommandBuffer::traceRays(
529-
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange, uint32_t raygenGroupStride,
529+
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange,
530530
const asset::SBufferRange<const IGPUBuffer>& missGroupsRange, uint32_t missGroupStride,
531531
const asset::SBufferRange<const IGPUBuffer>& hitGroupsRange, uint32_t hitGroupStride,
532532
const asset::SBufferRange<const IGPUBuffer>& callableGroupsRange, uint32_t callableGroupStride,
533533
uint32_t width, uint32_t height, uint32_t depth);
534534
bool IGPUCommandBuffer::traceRaysIndirect(
535-
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange, uint32_t raygenGroupStride,
535+
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange,
536536
const asset::SBufferRange<const IGPUBuffer>& missGroupsRange, uint32_t missGroupStride,
537537
const asset::SBufferRange<const IGPUBuffer>& hitGroupsRange, uint32_t hitGroupStride,
538538
const asset::SBufferRange<const IGPUBuffer>& callableGroupsRange, uint32_t callableGroupStride,
@@ -684,13 +684,13 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
684684

685685
virtual bool setRayTracingPipelineStackSize_impl(uint32_t pipelineStackSize) = 0;
686686
virtual bool traceRays_impl(
687-
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange, uint32_t raygenGroupStride,
687+
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange,
688688
const asset::SBufferRange<const IGPUBuffer>& missGroupsRange, uint32_t missGroupStride,
689689
const asset::SBufferRange<const IGPUBuffer>& hitGroupsRange, uint32_t hitGroupStride,
690690
const asset::SBufferRange<const IGPUBuffer>& callableGroupsRange, uint32_t callableGroupStride,
691691
uint32_t width, uint32_t height, uint32_t depth) = 0;
692692
virtual bool IGPUCommandBuffer::traceRaysIndirect_impl(
693-
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange, uint32_t raygenGroupStride,
693+
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange,
694694
const asset::SBufferRange<const IGPUBuffer>& missGroupsRange, uint32_t missGroupStride,
695695
const asset::SBufferRange<const IGPUBuffer>& hitGroupsRange, uint32_t hitGroupStride,
696696
const asset::SBufferRange<const IGPUBuffer>& callableGroupsRange, uint32_t callableGroupStride,
@@ -847,7 +847,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
847847
}
848848

849849
bool invalidShaderGroups(
850-
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange, uint32_t raygenGroupStride,
850+
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange,
851851
const asset::SBufferRange<const IGPUBuffer>& missGroupsRange, uint32_t missGroupStride,
852852
const asset::SBufferRange<const IGPUBuffer>& hitGroupsRange, uint32_t hitGroupStride,
853853
const asset::SBufferRange<const IGPUBuffer>& callableGroupsRange, uint32_t callableGroupStride,

‎src/nbl/video/CVulkanCommandBuffer.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -824,13 +824,13 @@ bool CVulkanCommandBuffer::setRayTracingPipelineStackSize_impl(uint32_t pipeline
824824
}
825825

826826
bool CVulkanCommandBuffer::traceRays_impl(
827-
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange, uint32_t raygenGroupStride,
827+
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange,
828828
const asset::SBufferRange<const IGPUBuffer>& missGroupsRange, uint32_t missGroupStride,
829829
const asset::SBufferRange<const IGPUBuffer>& hitGroupsRange, uint32_t hitGroupStride,
830830
const asset::SBufferRange<const IGPUBuffer>& callableGroupsRange, uint32_t callableGroupStride,
831831
uint32_t width, uint32_t height, uint32_t depth)
832832
{
833-
const auto vk_raygenGroupRegion = getVkStridedDeviceAddressRegion(raygenGroupRange, raygenGroupStride);
833+
const auto vk_raygenGroupRegion = getVkStridedDeviceAddressRegion(raygenGroupRange, raygenGroupRange.size);
834834
const auto vk_missGroupsRegion = getVkStridedDeviceAddressRegion(missGroupsRange, missGroupStride);
835835
const auto vk_hitGroupsRegion = getVkStridedDeviceAddressRegion(hitGroupsRange, hitGroupStride);
836836
const auto vk_callableGroupsRegion = getVkStridedDeviceAddressRegion(callableGroupsRange, callableGroupStride);
@@ -845,13 +845,13 @@ bool CVulkanCommandBuffer::traceRays_impl(
845845
}
846846

847847
bool CVulkanCommandBuffer::traceRaysIndirect_impl(
848-
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange, uint32_t raygenGroupStride,
848+
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange,
849849
const asset::SBufferRange<const IGPUBuffer>& missGroupsRange, uint32_t missGroupStride,
850850
const asset::SBufferRange<const IGPUBuffer>& hitGroupsRange, uint32_t hitGroupStride,
851851
const asset::SBufferRange<const IGPUBuffer>& callableGroupsRange, uint32_t callableGroupStride,
852852
const asset::SBufferBinding<const IGPUBuffer>& indirectBinding)
853853
{
854-
const auto vk_raygenGroupRegion = getVkStridedDeviceAddressRegion(raygenGroupRange, raygenGroupStride);
854+
const auto vk_raygenGroupRegion = getVkStridedDeviceAddressRegion(raygenGroupRange, raygenGroupRange.size);
855855
const auto vk_missGroupsRegion = getVkStridedDeviceAddressRegion(missGroupsRange, missGroupStride);
856856
const auto vk_hitGroupsRegion = getVkStridedDeviceAddressRegion(hitGroupsRange, hitGroupStride);
857857
const auto vk_callableGroupsRegion = getVkStridedDeviceAddressRegion(callableGroupsRange, callableGroupStride);

‎src/nbl/video/CVulkanCommandBuffer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,13 +227,13 @@ class CVulkanCommandBuffer final : public IGPUCommandBuffer
227227

228228
bool setRayTracingPipelineStackSize_impl(uint32_t pipelineStackSize) override;
229229
bool traceRays_impl(
230-
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange, uint32_t raygenGroupStride,
230+
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange,
231231
const asset::SBufferRange<const IGPUBuffer>& missGroupsRange, uint32_t missGroupStride,
232232
const asset::SBufferRange<const IGPUBuffer>& hitGroupsRange, uint32_t hitGroupStride,
233233
const asset::SBufferRange<const IGPUBuffer>& callableGroupsRange, uint32_t callableGroupStride,
234234
uint32_t width, uint32_t height, uint32_t depth) override;
235235
bool traceRaysIndirect_impl(
236-
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange, uint32_t raygenGroupStride,
236+
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange,
237237
const asset::SBufferRange<const IGPUBuffer>& missGroupsRange, uint32_t missGroupStride,
238238
const asset::SBufferRange<const IGPUBuffer>& hitGroupsRange, uint32_t hitGroupStride,
239239
const asset::SBufferRange<const IGPUBuffer>& callableGroupsRange, uint32_t callableGroupStride,

‎src/nbl/video/IGPUCommandBuffer.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ bool IGPUCommandBuffer::copyImage(const IGPUImage* const srcImage, const IGPUIma
683683
}
684684

685685
bool IGPUCommandBuffer::invalidShaderGroups(
686-
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange, uint32_t raygenGroupStride,
686+
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange,
687687
const asset::SBufferRange<const IGPUBuffer>& missGroupsRange, uint32_t missGroupStride,
688688
const asset::SBufferRange<const IGPUBuffer>& hitGroupsRange, uint32_t hitGroupStride,
689689
const asset::SBufferRange<const IGPUBuffer>& callableGroupsRange, uint32_t callableGroupStride,
@@ -763,7 +763,7 @@ bool IGPUCommandBuffer::invalidShaderGroups(
763763
return false;
764764
};
765765

766-
if (invalidBufferRegion(raygenGroupRange, raygenGroupStride, "Raygen Group")) return true;
766+
if (invalidBufferRegion(raygenGroupRange, raygenGroupRange.size, "Raygen Group")) return true;
767767
if (invalidBufferRegion(missGroupsRange, missGroupStride, "Miss groups")) return true;
768768
if (invalidBufferRegion(hitGroupsRange, hitGroupStride, "Hit groups")) return true;
769769
if (invalidBufferRegion(callableGroupsRange, callableGroupStride, "Callable groups")) return true;
@@ -1894,7 +1894,7 @@ bool IGPUCommandBuffer::setRayTracingPipelineStackSize(uint32_t pipelineStackSiz
18941894
}
18951895

18961896
bool IGPUCommandBuffer::traceRays(
1897-
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange, uint32_t raygenGroupStride,
1897+
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange,
18981898
const asset::SBufferRange<const IGPUBuffer>& missGroupsRange, uint32_t missGroupStride,
18991899
const asset::SBufferRange<const IGPUBuffer>& hitGroupsRange, uint32_t hitGroupStride,
19001900
const asset::SBufferRange<const IGPUBuffer>& callableGroupsRange, uint32_t callableGroupStride,
@@ -1927,7 +1927,7 @@ bool IGPUCommandBuffer::traceRays(
19271927
}
19281928
const auto flags = m_boundRayTracingPipeline->getCreationFlags();
19291929

1930-
if (invalidShaderGroups(raygenGroupRange, raygenGroupStride,
1930+
if (invalidShaderGroups(raygenGroupRange,
19311931
missGroupsRange, missGroupStride,
19321932
hitGroupsRange, hitGroupStride,
19331933
callableGroupsRange, callableGroupStride,
@@ -1950,15 +1950,15 @@ bool IGPUCommandBuffer::traceRays(
19501950
m_noCommands = false;
19511951

19521952
return traceRays_impl(
1953-
raygenGroupRange, raygenGroupStride,
1953+
raygenGroupRange,
19541954
missGroupsRange, missGroupStride,
19551955
hitGroupsRange, hitGroupStride,
19561956
callableGroupsRange, callableGroupStride,
19571957
width, height, depth);
19581958
}
19591959

19601960
bool IGPUCommandBuffer::traceRaysIndirect(
1961-
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange, uint32_t raygenGroupStride,
1961+
const asset::SBufferRange<const IGPUBuffer>& raygenGroupRange,
19621962
const asset::SBufferRange<const IGPUBuffer>& missGroupsRange, uint32_t missGroupStride,
19631963
const asset::SBufferRange<const IGPUBuffer>& hitGroupsRange, uint32_t hitGroupStride,
19641964
const asset::SBufferRange<const IGPUBuffer>& callableGroupsRange, uint32_t callableGroupStride,
@@ -1974,7 +1974,7 @@ bool IGPUCommandBuffer::traceRaysIndirect(
19741974
}
19751975
const auto flags = m_boundRayTracingPipeline->getCreationFlags();
19761976

1977-
if (invalidShaderGroups(raygenGroupRange, raygenGroupStride,
1977+
if (invalidShaderGroups(raygenGroupRange,
19781978
missGroupsRange, missGroupStride,
19791979
hitGroupsRange, hitGroupStride,
19801980
callableGroupsRange, callableGroupStride,
@@ -2003,7 +2003,7 @@ bool IGPUCommandBuffer::traceRaysIndirect(
20032003
m_noCommands = false;
20042004

20052005
return traceRaysIndirect_impl(
2006-
raygenGroupRange, raygenGroupStride,
2006+
raygenGroupRange,
20072007
missGroupsRange, missGroupStride,
20082008
hitGroupsRange, hitGroupStride,
20092009
callableGroupsRange, callableGroupStride,

0 commit comments

Comments
 (0)