Skip to content

Commit ae1549b

Browse files
headerbot[bot]spencer-lunarg
authored andcommitted
build: Update to header v1.4.363
1 parent 67e411f commit ae1549b

22 files changed

Lines changed: 717 additions & 961 deletions

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.22.1)
1919
# The VERSION field is generated with the "--generated-version" flag in the generate_source.py script
2020
#
2121
# If working with unreleased extensions, make sure the header and validation version are all on the same header version
22-
project(VVL VERSION 1.4.362 LANGUAGES CXX)
22+
project(VVL VERSION 1.4.363 LANGUAGES CXX)
2323

2424
# This variable enables downstream users to customize the target API
2525
# variant (e.g. Vulkan SC)

layers/VkLayer_khronos_validation.json.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"prefix": "vvl",
66
"type": "GLOBAL",
77
"library_path": "@JSON_LIBRARY_PATH@",
8-
"api_version": "1.4.362",
8+
"api_version": "1.4.363",
99
"implementation_version": "1",
1010
"description": "Khronos Validation Layer",
1111
"introduction": "The main, comprehensive Khronos validation layer.\n\nVulkan is an Explicit API, enabling direct control over how GPUs actually work. By design, minimal error checking is done inside a Vulkan driver. Applications have full control and responsibility for correct operation. Any errors in how Vulkan is used can result in a crash. \n\nThe Khronos Validation Layer can be enabled to assist development by enabling developers to verify their applications correctly use the Vulkan API.",

layers/stateless/sl_device_generated_commands.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ bool Device::ValidateIndirectExecutionSetShaderInfo(const Context& context, cons
109109
const Location pc_range_loc = shader_info_loc.dot(Field::pPushConstantRanges, i);
110110
skip |= context.ValidateFlags(pc_range_loc.dot(Field::stageFlags), vvl::FlagBitmask::VkShaderStageFlagBits,
111111
AllVkShaderStageFlagBits, shader_info.pPushConstantRanges[i].stageFlags, kRequiredFlags,
112-
"VUID-VkPushConstantRange-stageFlags-parameter",
113-
"VUID-VkPushConstantRange-stageFlags-requiredbitmask");
112+
"VUID-VkPushConstantRange-stageFlags-parameter");
114113
}
115114
}
116115

@@ -173,10 +172,10 @@ bool Device::ValidateIndirectCommandsPushConstantToken(const Context& context,
173172
VkIndirectCommandsTokenTypeEXT token_type,
174173
const Location& push_constant_token_loc) const {
175174
bool skip = false;
176-
skip |= context.ValidateFlags(
177-
push_constant_token_loc.dot(Field::updateRange).dot(Field::stageFlags), vvl::FlagBitmask::VkShaderStageFlagBits,
178-
AllVkShaderStageFlagBits, push_constant_token.updateRange.stageFlags, kRequiredFlags,
179-
"VUID-VkPushConstantRange-stageFlags-parameter", "VUID-VkPushConstantRange-stageFlags-requiredbitmask");
175+
skip |= context.ValidateFlags(push_constant_token_loc.dot(Field::updateRange).dot(Field::stageFlags),
176+
vvl::FlagBitmask::VkShaderStageFlagBits, AllVkShaderStageFlagBits,
177+
push_constant_token.updateRange.stageFlags, kRequiredFlags,
178+
"VUID-VkPushConstantRange-stageFlags-parameter");
180179

181180
if ((token_type == VK_INDIRECT_COMMANDS_TOKEN_TYPE_PUSH_DATA_SEQUENCE_INDEX_EXT ||
182181
token_type == VK_INDIRECT_COMMANDS_TOKEN_TYPE_SEQUENCE_INDEX_EXT) &&
@@ -228,8 +227,7 @@ bool Device::ValidateIndirectCommandsExecutionSetToken(const Context& context,
228227

229228
skip |= context.ValidateFlags(exe_set_token_loc.dot(Field::shaderStages), vvl::FlagBitmask::VkShaderStageFlagBits,
230229
AllVkShaderStageFlagBits, exe_set_token.shaderStages, kRequiredFlags,
231-
"VUID-VkIndirectCommandsExecutionSetTokenEXT-shaderStages-parameter",
232-
"VUID-VkIndirectCommandsExecutionSetTokenEXT-shaderStages-requiredbitmask");
230+
"VUID-VkIndirectCommandsExecutionSetTokenEXT-shaderStages-parameter");
233231

234232
const auto& props = phys_dev_ext_props.device_generated_commands_props;
235233
if ((exe_set_token.shaderStages & (props.supportedIndirectCommandsShaderStagesPipelineBinding |

layers/stateless/sl_utils.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,8 @@ bool Context::ValidateFlagsImplementation(const Location& loc, vvl::FlagBitmask
377377
bool skip = false;
378378

379379
const bool required = flag_type == kRequiredFlags || flag_type == kRequiredSingleBit;
380-
const char* zero_vuid = flag_type == kRequiredFlags ? flags_zero_vuid : vuid;
380+
// Normally zero is invalid already, but a few cases still pass an explicit |flags_zero_vuid| in
381+
const char* zero_vuid = (flag_type == kRequiredFlags && flags_zero_vuid) ? flags_zero_vuid : vuid;
381382
if (required && value == 0) {
382383
skip |= log.LogError(zero_vuid, error_obj.handle, loc, "is zero.");
383384
}

layers/vulkan/generated/enum_flag_bits.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <array>
2525
#include "vulkan/vulkan.h"
2626
// clang-format off
27-
const uint32_t GeneratedVulkanHeaderVersion = 362;
27+
const uint32_t GeneratedVulkanHeaderVersion = 363;
2828
const VkInstanceCreateFlags AllVkInstanceCreateFlagBits = VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
2929
const VkDeviceQueueCreateFlags AllVkDeviceQueueCreateFlagBits = VK_DEVICE_QUEUE_CREATE_PROTECTED_BIT|VK_DEVICE_QUEUE_CREATE_INTERNALLY_SYNCHRONIZED_BIT_KHR;
3030
const VkPipelineStageFlags AllVkPipelineStageFlagBits = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT|VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT|VK_PIPELINE_STAGE_VERTEX_INPUT_BIT|VK_PIPELINE_STAGE_VERTEX_SHADER_BIT|VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT|VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT|VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT|VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT|VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT|VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT|VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT|VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT|VK_PIPELINE_STAGE_TRANSFER_BIT|VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT|VK_PIPELINE_STAGE_HOST_BIT|VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT|VK_PIPELINE_STAGE_ALL_COMMANDS_BIT|VK_PIPELINE_STAGE_NONE|VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT|VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT|VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR|VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR|VK_PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT_EXT|VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR|VK_PIPELINE_STAGE_TASK_SHADER_BIT_EXT|VK_PIPELINE_STAGE_MESH_SHADER_BIT_EXT|VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_EXT;

layers/vulkan/generated/error_location_helper.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,6 +1656,7 @@ const char* String(Struct structure) {
16561656
{"VkPhysicalDeviceImageViewMinLodFeaturesEXT", 43},
16571657
{"VkPhysicalDeviceImagelessFramebufferFeatures", 45},
16581658
{"VkPhysicalDeviceIndexTypeUint8Features", 39},
1659+
{"VkPhysicalDeviceInfoPropertiesINTEL", 36},
16591660
{"VkPhysicalDeviceInheritedViewportScissorFeaturesNV", 51},
16601661
{"VkPhysicalDeviceInlineUniformBlockFeatures", 43},
16611662
{"VkPhysicalDeviceInlineUniformBlockProperties", 45},
@@ -2802,6 +2803,9 @@ const char* String(Field field) {
28022803
{"deviceID", 9},
28032804
{"deviceIndex", 12},
28042805
{"deviceIndexCount", 17},
2806+
{"deviceIpVersionArch", 20},
2807+
{"deviceIpVersionRelease", 23},
2808+
{"deviceIpVersionRevision", 24},
28052809
{"deviceLUID", 11},
28062810
{"deviceLUIDValid", 16},
28072811
{"deviceMask", 11},
@@ -6310,6 +6314,7 @@ const char* String(Extension extension) {
63106314
{"VK_IMG_filter_linear_2d", 24},
63116315
{"VK_IMG_format_pvrtc", 20},
63126316
{"VK_IMG_relaxed_line_rasterization", 34},
6317+
{"VK_INTEL_device_info", 21},
63136318
{"VK_INTEL_performance_query", 27},
63146319
{"VK_INTEL_shader_integer_functions2", 35},
63156320
{"VK_KHR_16bit_storage", 21},
@@ -9695,6 +9700,8 @@ Struct StypeToStruct(VkStructureType stype) {
96959700
return Struct::VkPhysicalDeviceCooperativeMatrixDecodeVectorFeaturesNV;
96969701
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_BASE_HANDLE_FEATURES_NV:
96979702
return Struct::VkPhysicalDevicePrivateDataBaseHandleFeaturesNV;
9703+
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INFO_PROPERTIES_INTEL:
9704+
return Struct::VkPhysicalDeviceInfoPropertiesINTEL;
96989705
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_ALLOCATION_ALIGNMENT_FEATURES_VALVE:
96999706
return Struct::VkPhysicalDeviceBufferDeviceAddressAllocationAlignmentFeaturesVALVE;
97009707
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_ALLOCATION_ALIGNMENT_PROPERTIES_VALVE:

layers/vulkan/generated/error_location_helper.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1650,6 +1650,7 @@ enum class Struct {
16501650
VkPhysicalDeviceImageViewMinLodFeaturesEXT,
16511651
VkPhysicalDeviceImagelessFramebufferFeatures,
16521652
VkPhysicalDeviceIndexTypeUint8Features,
1653+
VkPhysicalDeviceInfoPropertiesINTEL,
16531654
VkPhysicalDeviceInheritedViewportScissorFeaturesNV,
16541655
VkPhysicalDeviceInlineUniformBlockFeatures,
16551656
VkPhysicalDeviceInlineUniformBlockProperties,
@@ -2793,6 +2794,9 @@ enum class Field {
27932794
deviceID,
27942795
deviceIndex,
27952796
deviceIndexCount,
2797+
deviceIpVersionArch,
2798+
deviceIpVersionRelease,
2799+
deviceIpVersionRevision,
27962800
deviceLUID,
27972801
deviceLUIDValid,
27982802
deviceMask,
@@ -6292,6 +6296,7 @@ enum class Extension {
62926296
_VK_IMG_filter_linear_2d,
62936297
_VK_IMG_format_pvrtc,
62946298
_VK_IMG_relaxed_line_rasterization,
6299+
_VK_INTEL_device_info,
62956300
_VK_INTEL_performance_query,
62966301
_VK_INTEL_shader_integer_functions2,
62976302
_VK_KHR_16bit_storage,

layers/vulkan/generated/pnext_chain_extraction.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4158,6 +4158,11 @@ void PnextChainFree(void* chain) {
41584158
header->pNext = nullptr;
41594159
delete reinterpret_cast<const VkPhysicalDevicePrivateDataBaseHandleFeaturesNV*>(header);
41604160
break;
4161+
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INFO_PROPERTIES_INTEL:
4162+
PnextChainFree(header->pNext);
4163+
header->pNext = nullptr;
4164+
delete reinterpret_cast<const VkPhysicalDeviceInfoPropertiesINTEL*>(header);
4165+
break;
41614166
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_ALLOCATION_ALIGNMENT_FEATURES_VALVE:
41624167
PnextChainFree(header->pNext);
41634168
header->pNext = nullptr;

0 commit comments

Comments
 (0)