Skip to content

Commit 164554d

Browse files
arno-lunargarno-lunarg
committed
layers: Remove accel struct maps
1 parent 13deb08 commit 164554d

7 files changed

+23
-311
lines changed

‎layers/layer_chassis_dispatch_manual.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,7 @@ VkResult DispatchBuildAccelerationStructuresKHR(
14491449
if (pInfos) {
14501450
local_pInfos = new safe_VkAccelerationStructureBuildGeometryInfoKHR[infoCount];
14511451
for (uint32_t index0 = 0; index0 < infoCount; ++index0) {
1452-
local_pInfos[index0].initialize(&pInfos[index0], true, ppBuildRangeInfos[index0]);
1452+
local_pInfos[index0].initialize(&pInfos[index0]);
14531453
if (pInfos[index0].srcAccelerationStructure) {
14541454
local_pInfos[index0].srcAccelerationStructure = layer_data->Unwrap(pInfos[index0].srcAccelerationStructure);
14551455
}
@@ -1506,7 +1506,7 @@ void DispatchGetAccelerationStructureBuildSizesKHR(
15061506
{
15071507
if (pBuildInfo) {
15081508
local_pBuildInfo = &var_local_pBuildInfo;
1509-
local_pBuildInfo->initialize(pBuildInfo, false, nullptr);
1509+
local_pBuildInfo->initialize(pBuildInfo);
15101510
if (pBuildInfo->srcAccelerationStructure) {
15111511
local_pBuildInfo->srcAccelerationStructure = layer_data->Unwrap(pBuildInfo->srcAccelerationStructure);
15121512
}

‎layers/state_tracker/ray_tracing_state.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ class AccelerationStructureKHR : public StateObject {
9797
StateObject::Destroy();
9898
}
9999

100-
void Build(const VkAccelerationStructureBuildGeometryInfoKHR *pInfo, const bool is_host,
101-
const VkAccelerationStructureBuildRangeInfoKHR *build_range_info) {
100+
void Build(const VkAccelerationStructureBuildGeometryInfoKHR *pInfo, const bool,
101+
const VkAccelerationStructureBuildRangeInfoKHR *) {
102102
built = true;
103-
build_info_khr.initialize(pInfo, is_host, build_range_info);
103+
build_info_khr.initialize(pInfo);
104104
};
105105

106106
void UpdateBuildRangeInfos(const VkAccelerationStructureBuildRangeInfoKHR *p_build_range_infos, uint32_t geometry_count) {

‎layers/vulkan/generated/layer_chassis_dispatch.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -8800,7 +8800,7 @@ void DispatchCmdBuildAccelerationStructuresKHR(VkCommandBuffer commandBuffer, ui
88008800
if (pInfos) {
88018801
local_pInfos = new safe_VkAccelerationStructureBuildGeometryInfoKHR[infoCount];
88028802
for (uint32_t index0 = 0; index0 < infoCount; ++index0) {
8803-
local_pInfos[index0].initialize(&pInfos[index0], false, nullptr);
8803+
local_pInfos[index0].initialize(&pInfos[index0]);
88048804

88058805
if (pInfos[index0].srcAccelerationStructure) {
88068806
local_pInfos[index0].srcAccelerationStructure = layer_data->Unwrap(pInfos[index0].srcAccelerationStructure);
@@ -8832,7 +8832,7 @@ void DispatchCmdBuildAccelerationStructuresIndirectKHR(VkCommandBuffer commandBu
88328832
if (pInfos) {
88338833
local_pInfos = new safe_VkAccelerationStructureBuildGeometryInfoKHR[infoCount];
88348834
for (uint32_t index0 = 0; index0 < infoCount; ++index0) {
8835-
local_pInfos[index0].initialize(&pInfos[index0], false, nullptr);
8835+
local_pInfos[index0].initialize(&pInfos[index0]);
88368836

88378837
if (pInfos[index0].srcAccelerationStructure) {
88388838
local_pInfos[index0].srcAccelerationStructure = layer_data->Unwrap(pInfos[index0].srcAccelerationStructure);

‎layers/vulkan/generated/vk_safe_struct.h

+4-9
Original file line numberDiff line numberDiff line change
@@ -18105,15 +18105,13 @@ struct safe_VkAccelerationStructureGeometryKHR {
1810518105
VkAccelerationStructureGeometryDataKHR geometry;
1810618106
VkGeometryFlagsKHR flags;
1810718107

18108-
safe_VkAccelerationStructureGeometryKHR(const VkAccelerationStructureGeometryKHR* in_struct, const bool is_host,
18109-
const VkAccelerationStructureBuildRangeInfoKHR* build_range_info,
18110-
PNextCopyState* copy_state = {}, bool copy_pnext = true);
18108+
safe_VkAccelerationStructureGeometryKHR(const VkAccelerationStructureGeometryKHR* in_struct, PNextCopyState* copy_state = {},
18109+
bool copy_pnext = true);
1811118110
safe_VkAccelerationStructureGeometryKHR(const safe_VkAccelerationStructureGeometryKHR& copy_src);
1811218111
safe_VkAccelerationStructureGeometryKHR& operator=(const safe_VkAccelerationStructureGeometryKHR& copy_src);
1811318112
safe_VkAccelerationStructureGeometryKHR();
1811418113
~safe_VkAccelerationStructureGeometryKHR();
18115-
void initialize(const VkAccelerationStructureGeometryKHR* in_struct, const bool is_host,
18116-
const VkAccelerationStructureBuildRangeInfoKHR* build_range_info, PNextCopyState* copy_state = {});
18114+
void initialize(const VkAccelerationStructureGeometryKHR* in_struct, PNextCopyState* copy_state = {});
1811718115
void initialize(const safe_VkAccelerationStructureGeometryKHR* copy_src, PNextCopyState* copy_state = {});
1811818116
VkAccelerationStructureGeometryKHR* ptr() { return reinterpret_cast<VkAccelerationStructureGeometryKHR*>(this); }
1811918117
VkAccelerationStructureGeometryKHR const* ptr() const {
@@ -18134,15 +18132,12 @@ struct safe_VkAccelerationStructureBuildGeometryInfoKHR {
1813418132
safe_VkDeviceOrHostAddressKHR scratchData;
1813518133

1813618134
safe_VkAccelerationStructureBuildGeometryInfoKHR(const VkAccelerationStructureBuildGeometryInfoKHR* in_struct,
18137-
const bool is_host,
18138-
const VkAccelerationStructureBuildRangeInfoKHR* build_range_infos,
1813918135
PNextCopyState* copy_state = {}, bool copy_pnext = true);
1814018136
safe_VkAccelerationStructureBuildGeometryInfoKHR(const safe_VkAccelerationStructureBuildGeometryInfoKHR& copy_src);
1814118137
safe_VkAccelerationStructureBuildGeometryInfoKHR& operator=(const safe_VkAccelerationStructureBuildGeometryInfoKHR& copy_src);
1814218138
safe_VkAccelerationStructureBuildGeometryInfoKHR();
1814318139
~safe_VkAccelerationStructureBuildGeometryInfoKHR();
18144-
void initialize(const VkAccelerationStructureBuildGeometryInfoKHR* in_struct, const bool is_host,
18145-
const VkAccelerationStructureBuildRangeInfoKHR* build_range_infos, PNextCopyState* copy_state = {});
18140+
void initialize(const VkAccelerationStructureBuildGeometryInfoKHR* in_struct, PNextCopyState* copy_state = {});
1814618141
void initialize(const safe_VkAccelerationStructureBuildGeometryInfoKHR* copy_src, PNextCopyState* copy_state = {});
1814718142
VkAccelerationStructureBuildGeometryInfoKHR* ptr() {
1814818143
return reinterpret_cast<VkAccelerationStructureBuildGeometryInfoKHR*>(this);

0 commit comments

Comments
 (0)