Skip to content

Commit

Permalink
build: Update to header 1.3.298
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikes-lunarg
mikes-lunarg committed Oct 11, 2024
1 parent 8c907ea commit bfd8595
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 14 deletions.
9 changes: 7 additions & 2 deletions include/vulkan/utility/vk_safe_struct.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10168,6 +10168,7 @@ struct safe_VkPhysicalDeviceShaderEnqueueFeaturesAMDX {
VkStructureType sType;
void* pNext{};
VkBool32 shaderEnqueue;
VkBool32 shaderMeshEnqueue;

safe_VkPhysicalDeviceShaderEnqueueFeaturesAMDX(const VkPhysicalDeviceShaderEnqueueFeaturesAMDX* in_struct,
PNextCopyState* copy_state = {}, bool copy_pnext = true);
Expand All @@ -10190,6 +10191,8 @@ struct safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX {
uint32_t maxExecutionGraphShaderPayloadSize;
uint32_t maxExecutionGraphShaderPayloadCount;
uint32_t executionGraphDispatchAddressAlignment;
uint32_t maxExecutionGraphWorkgroupCount[3];
uint32_t maxExecutionGraphWorkgroups;

safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX(const VkPhysicalDeviceShaderEnqueuePropertiesAMDX* in_struct,
PNextCopyState* copy_state = {}, bool copy_pnext = true);
Expand All @@ -10209,7 +10212,9 @@ struct safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX {
struct safe_VkExecutionGraphPipelineScratchSizeAMDX {
VkStructureType sType;
void* pNext{};
VkDeviceSize size;
VkDeviceSize minSize;
VkDeviceSize maxSize;
VkDeviceSize sizeGranularity;

safe_VkExecutionGraphPipelineScratchSizeAMDX(const VkExecutionGraphPipelineScratchSizeAMDX* in_struct,
PNextCopyState* copy_state = {}, bool copy_pnext = true);
Expand Down Expand Up @@ -18485,7 +18490,7 @@ struct safe_VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT {
};
struct safe_VkGeneratedCommandsMemoryRequirementsInfoEXT {
VkStructureType sType;
void* pNext{};
const void* pNext{};
VkIndirectExecutionSetEXT indirectExecutionSet;
VkIndirectCommandsLayoutEXT indirectCommandsLayout;
uint32_t maxSequenceCount;
Expand Down
5 changes: 5 additions & 0 deletions include/vulkan/vk_enum_string_helper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8429,6 +8429,9 @@ static inline const char* string_VkPipelineCreateFlagBits2KHR(uint64_t input_val
if (input_value == VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT_KHR) return "VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT_KHR";
if (input_value == VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT_KHR) return "VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT_KHR";
if (input_value == VK_PIPELINE_CREATE_2_DERIVATIVE_BIT_KHR) return "VK_PIPELINE_CREATE_2_DERIVATIVE_BIT_KHR";
#ifdef VK_ENABLE_BETA_EXTENSIONS
if (input_value == VK_PIPELINE_CREATE_2_EXECUTION_GRAPH_BIT_AMDX) return "VK_PIPELINE_CREATE_2_EXECUTION_GRAPH_BIT_AMDX";
#endif // VK_ENABLE_BETA_EXTENSIONS
if (input_value == VK_PIPELINE_CREATE_2_ENABLE_LEGACY_DITHERING_BIT_EXT) return "VK_PIPELINE_CREATE_2_ENABLE_LEGACY_DITHERING_BIT_EXT";
if (input_value == VK_PIPELINE_CREATE_2_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR) return "VK_PIPELINE_CREATE_2_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR";
if (input_value == VK_PIPELINE_CREATE_2_DISPATCH_BASE_BIT_KHR) return "VK_PIPELINE_CREATE_2_DISPATCH_BASE_BIT_KHR";
Expand Down Expand Up @@ -8489,7 +8492,9 @@ static inline const char* string_VkBufferUsageFlagBits2KHR(uint64_t input_value)
if (input_value == VK_BUFFER_USAGE_2_INDEX_BUFFER_BIT_KHR) return "VK_BUFFER_USAGE_2_INDEX_BUFFER_BIT_KHR";
if (input_value == VK_BUFFER_USAGE_2_VERTEX_BUFFER_BIT_KHR) return "VK_BUFFER_USAGE_2_VERTEX_BUFFER_BIT_KHR";
if (input_value == VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT_KHR) return "VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT_KHR";
#ifdef VK_ENABLE_BETA_EXTENSIONS
if (input_value == VK_BUFFER_USAGE_2_EXECUTION_GRAPH_SCRATCH_BIT_AMDX) return "VK_BUFFER_USAGE_2_EXECUTION_GRAPH_SCRATCH_BIT_AMDX";
#endif // VK_ENABLE_BETA_EXTENSIONS
if (input_value == VK_BUFFER_USAGE_2_CONDITIONAL_RENDERING_BIT_EXT) return "VK_BUFFER_USAGE_2_CONDITIONAL_RENDERING_BIT_EXT";
if (input_value == VK_BUFFER_USAGE_2_SHADER_BINDING_TABLE_BIT_KHR) return "VK_BUFFER_USAGE_2_SHADER_BINDING_TABLE_BIT_KHR";
if (input_value == VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT) return "VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT";
Expand Down
4 changes: 2 additions & 2 deletions scripts/known_good.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"sub_dir": "Vulkan-Headers",
"build_dir": "Vulkan-Headers/build",
"install_dir": "Vulkan-Headers/build/install",
"commit": "v1.3.297"
"commit": "v1.3.298"
},
{
"name": "googletest",
Expand Down Expand Up @@ -46,4 +46,4 @@
"googletest": "GOOGLETEST_INSTALL_DIR",
"magic_enum": "MAGIC_ENUM_INSTALL_DIR"
}
}
}
64 changes: 54 additions & 10 deletions src/vulkan/vk_safe_struct_vendor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2320,19 +2320,20 @@ void safe_VkAndroidHardwareBufferFormatProperties2ANDROID::initialize(

safe_VkPhysicalDeviceShaderEnqueueFeaturesAMDX::safe_VkPhysicalDeviceShaderEnqueueFeaturesAMDX(
const VkPhysicalDeviceShaderEnqueueFeaturesAMDX* in_struct, [[maybe_unused]] PNextCopyState* copy_state, bool copy_pnext)
: sType(in_struct->sType), shaderEnqueue(in_struct->shaderEnqueue) {
: sType(in_struct->sType), shaderEnqueue(in_struct->shaderEnqueue), shaderMeshEnqueue(in_struct->shaderMeshEnqueue) {
if (copy_pnext) {
pNext = SafePnextCopy(in_struct->pNext, copy_state);
}
}

safe_VkPhysicalDeviceShaderEnqueueFeaturesAMDX::safe_VkPhysicalDeviceShaderEnqueueFeaturesAMDX()
: sType(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ENQUEUE_FEATURES_AMDX), pNext(nullptr), shaderEnqueue() {}
: sType(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ENQUEUE_FEATURES_AMDX), pNext(nullptr), shaderEnqueue(), shaderMeshEnqueue() {}

safe_VkPhysicalDeviceShaderEnqueueFeaturesAMDX::safe_VkPhysicalDeviceShaderEnqueueFeaturesAMDX(
const safe_VkPhysicalDeviceShaderEnqueueFeaturesAMDX& copy_src) {
sType = copy_src.sType;
shaderEnqueue = copy_src.shaderEnqueue;
shaderMeshEnqueue = copy_src.shaderMeshEnqueue;
pNext = SafePnextCopy(copy_src.pNext);
}

Expand All @@ -2344,6 +2345,7 @@ safe_VkPhysicalDeviceShaderEnqueueFeaturesAMDX& safe_VkPhysicalDeviceShaderEnque

sType = copy_src.sType;
shaderEnqueue = copy_src.shaderEnqueue;
shaderMeshEnqueue = copy_src.shaderMeshEnqueue;
pNext = SafePnextCopy(copy_src.pNext);

return *this;
Expand All @@ -2356,13 +2358,15 @@ void safe_VkPhysicalDeviceShaderEnqueueFeaturesAMDX::initialize(const VkPhysical
FreePnextChain(pNext);
sType = in_struct->sType;
shaderEnqueue = in_struct->shaderEnqueue;
shaderMeshEnqueue = in_struct->shaderMeshEnqueue;
pNext = SafePnextCopy(in_struct->pNext, copy_state);
}

void safe_VkPhysicalDeviceShaderEnqueueFeaturesAMDX::initialize(const safe_VkPhysicalDeviceShaderEnqueueFeaturesAMDX* copy_src,
[[maybe_unused]] PNextCopyState* copy_state) {
sType = copy_src->sType;
shaderEnqueue = copy_src->shaderEnqueue;
shaderMeshEnqueue = copy_src->shaderMeshEnqueue;
pNext = SafePnextCopy(copy_src->pNext);
}

Expand All @@ -2373,10 +2377,14 @@ safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX::safe_VkPhysicalDeviceShaderEnq
maxExecutionGraphShaderOutputNodes(in_struct->maxExecutionGraphShaderOutputNodes),
maxExecutionGraphShaderPayloadSize(in_struct->maxExecutionGraphShaderPayloadSize),
maxExecutionGraphShaderPayloadCount(in_struct->maxExecutionGraphShaderPayloadCount),
executionGraphDispatchAddressAlignment(in_struct->executionGraphDispatchAddressAlignment) {
executionGraphDispatchAddressAlignment(in_struct->executionGraphDispatchAddressAlignment),
maxExecutionGraphWorkgroups(in_struct->maxExecutionGraphWorkgroups) {
if (copy_pnext) {
pNext = SafePnextCopy(in_struct->pNext, copy_state);
}
for (uint32_t i = 0; i < 3; ++i) {
maxExecutionGraphWorkgroupCount[i] = in_struct->maxExecutionGraphWorkgroupCount[i];
}
}

safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX::safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX()
Expand All @@ -2386,7 +2394,8 @@ safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX::safe_VkPhysicalDeviceShaderEnq
maxExecutionGraphShaderOutputNodes(),
maxExecutionGraphShaderPayloadSize(),
maxExecutionGraphShaderPayloadCount(),
executionGraphDispatchAddressAlignment() {}
executionGraphDispatchAddressAlignment(),
maxExecutionGraphWorkgroups() {}

safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX::safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX(
const safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX& copy_src) {
Expand All @@ -2396,7 +2405,12 @@ safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX::safe_VkPhysicalDeviceShaderEnq
maxExecutionGraphShaderPayloadSize = copy_src.maxExecutionGraphShaderPayloadSize;
maxExecutionGraphShaderPayloadCount = copy_src.maxExecutionGraphShaderPayloadCount;
executionGraphDispatchAddressAlignment = copy_src.executionGraphDispatchAddressAlignment;
maxExecutionGraphWorkgroups = copy_src.maxExecutionGraphWorkgroups;
pNext = SafePnextCopy(copy_src.pNext);

for (uint32_t i = 0; i < 3; ++i) {
maxExecutionGraphWorkgroupCount[i] = copy_src.maxExecutionGraphWorkgroupCount[i];
}
}

safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX& safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX::operator=(
Expand All @@ -2411,8 +2425,13 @@ safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX& safe_VkPhysicalDeviceShaderEnq
maxExecutionGraphShaderPayloadSize = copy_src.maxExecutionGraphShaderPayloadSize;
maxExecutionGraphShaderPayloadCount = copy_src.maxExecutionGraphShaderPayloadCount;
executionGraphDispatchAddressAlignment = copy_src.executionGraphDispatchAddressAlignment;
maxExecutionGraphWorkgroups = copy_src.maxExecutionGraphWorkgroups;
pNext = SafePnextCopy(copy_src.pNext);

for (uint32_t i = 0; i < 3; ++i) {
maxExecutionGraphWorkgroupCount[i] = copy_src.maxExecutionGraphWorkgroupCount[i];
}

return *this;
}

Expand All @@ -2427,7 +2446,12 @@ void safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX::initialize(const VkPhysic
maxExecutionGraphShaderPayloadSize = in_struct->maxExecutionGraphShaderPayloadSize;
maxExecutionGraphShaderPayloadCount = in_struct->maxExecutionGraphShaderPayloadCount;
executionGraphDispatchAddressAlignment = in_struct->executionGraphDispatchAddressAlignment;
maxExecutionGraphWorkgroups = in_struct->maxExecutionGraphWorkgroups;
pNext = SafePnextCopy(in_struct->pNext, copy_state);

for (uint32_t i = 0; i < 3; ++i) {
maxExecutionGraphWorkgroupCount[i] = in_struct->maxExecutionGraphWorkgroupCount[i];
}
}

void safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX::initialize(const safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX* copy_src,
Expand All @@ -2438,24 +2462,38 @@ void safe_VkPhysicalDeviceShaderEnqueuePropertiesAMDX::initialize(const safe_VkP
maxExecutionGraphShaderPayloadSize = copy_src->maxExecutionGraphShaderPayloadSize;
maxExecutionGraphShaderPayloadCount = copy_src->maxExecutionGraphShaderPayloadCount;
executionGraphDispatchAddressAlignment = copy_src->executionGraphDispatchAddressAlignment;
maxExecutionGraphWorkgroups = copy_src->maxExecutionGraphWorkgroups;
pNext = SafePnextCopy(copy_src->pNext);

for (uint32_t i = 0; i < 3; ++i) {
maxExecutionGraphWorkgroupCount[i] = copy_src->maxExecutionGraphWorkgroupCount[i];
}
}

safe_VkExecutionGraphPipelineScratchSizeAMDX::safe_VkExecutionGraphPipelineScratchSizeAMDX(
const VkExecutionGraphPipelineScratchSizeAMDX* in_struct, [[maybe_unused]] PNextCopyState* copy_state, bool copy_pnext)
: sType(in_struct->sType), size(in_struct->size) {
: sType(in_struct->sType),
minSize(in_struct->minSize),
maxSize(in_struct->maxSize),
sizeGranularity(in_struct->sizeGranularity) {
if (copy_pnext) {
pNext = SafePnextCopy(in_struct->pNext, copy_state);
}
}

safe_VkExecutionGraphPipelineScratchSizeAMDX::safe_VkExecutionGraphPipelineScratchSizeAMDX()
: sType(VK_STRUCTURE_TYPE_EXECUTION_GRAPH_PIPELINE_SCRATCH_SIZE_AMDX), pNext(nullptr), size() {}
: sType(VK_STRUCTURE_TYPE_EXECUTION_GRAPH_PIPELINE_SCRATCH_SIZE_AMDX),
pNext(nullptr),
minSize(),
maxSize(),
sizeGranularity() {}

safe_VkExecutionGraphPipelineScratchSizeAMDX::safe_VkExecutionGraphPipelineScratchSizeAMDX(
const safe_VkExecutionGraphPipelineScratchSizeAMDX& copy_src) {
sType = copy_src.sType;
size = copy_src.size;
minSize = copy_src.minSize;
maxSize = copy_src.maxSize;
sizeGranularity = copy_src.sizeGranularity;
pNext = SafePnextCopy(copy_src.pNext);
}

Expand All @@ -2466,7 +2504,9 @@ safe_VkExecutionGraphPipelineScratchSizeAMDX& safe_VkExecutionGraphPipelineScrat
FreePnextChain(pNext);

sType = copy_src.sType;
size = copy_src.size;
minSize = copy_src.minSize;
maxSize = copy_src.maxSize;
sizeGranularity = copy_src.sizeGranularity;
pNext = SafePnextCopy(copy_src.pNext);

return *this;
Expand All @@ -2478,14 +2518,18 @@ void safe_VkExecutionGraphPipelineScratchSizeAMDX::initialize(const VkExecutionG
[[maybe_unused]] PNextCopyState* copy_state) {
FreePnextChain(pNext);
sType = in_struct->sType;
size = in_struct->size;
minSize = in_struct->minSize;
maxSize = in_struct->maxSize;
sizeGranularity = in_struct->sizeGranularity;
pNext = SafePnextCopy(in_struct->pNext, copy_state);
}

void safe_VkExecutionGraphPipelineScratchSizeAMDX::initialize(const safe_VkExecutionGraphPipelineScratchSizeAMDX* copy_src,
[[maybe_unused]] PNextCopyState* copy_state) {
sType = copy_src->sType;
size = copy_src->size;
minSize = copy_src->minSize;
maxSize = copy_src->maxSize;
sizeGranularity = copy_src->sizeGranularity;
pNext = SafePnextCopy(copy_src->pNext);
}

Expand Down

0 comments on commit bfd8595

Please sign in to comment.