layers: VUID Churn 1.4.350

Author: spencer-lunarg

layers/core_checks/cc_device_generated_commands.cpp

@@ -668,9 +668,8 @@ bool CoreChecks::ValidateGeneratedCommandsInfo(const vvl::CommandBuffer& cb_stat
     }
 
     {
-        // VUID being added in https://gitlab.khronos.org/vulkan/vulkan/-/merge_requests/8220
         BufferAddressValidation<1> buffer_address_validator = {
-            {{{"UNASSIGNED-VkGeneratedCommandsInfoEXT-indirectAddress-usage",
+            {{{"VUID-VkGeneratedCommandsInfoEXT-indirectAddress-12407",
                [](const vvl::Buffer& buffer_state) { return (buffer_state.usage & VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT) == 0; },
                []() { return "The following buffers are missing VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT"; }, kUsageErrorMsgBuffer}}}};
 

layers/core_checks/cc_drawdispatch.cpp

@@ -2189,7 +2189,7 @@ bool CoreChecks::ValidateActionStatePushConstant(const LastBound& last_bound_sta
                     // Edge case where if the shader is using push constants statically and there never was a vkCmdPushConstants
                     if (!cb_state.push_constant_ranges_layout && !enabled_features.maintenance4) {
                         const LogObjectList objlist(cb_state.Handle(), pipeline_layout->Handle(), pipeline->Handle());
-                        skip |= LogError(CreateActionVuid(loc.function, vvl::ActionVUID::PUSH_CONSTANT_08602), objlist, loc,
+                        skip |= LogError(CreateActionVuid(loc.function, vvl::ActionVUID::PUSH_CONSTANT_08601), objlist, loc,
                                          "Shader in %s uses push-constant statically but vkCmdPushConstants was not called yet for "
                                          "%s bound by vkCmdBindPipeline.",
                                          string_VkShaderStageFlags(stage.GetStage()).c_str(),
@@ -2212,7 +2212,7 @@ bool CoreChecks::ValidateActionStatePushConstant(const LastBound& last_bound_sta
                     // Edge case where if the shader is using push constants statically and there never was a vkCmdPushConstants
                     if (!cb_state.push_constant_ranges_layout && !enabled_features.maintenance4) {
                         const LogObjectList objlist(cb_state.Handle(), shader_object->Handle());
-                        skip |= LogError(CreateActionVuid(loc.function, vvl::ActionVUID::PUSH_CONSTANT_08602), objlist, loc,
+                        skip |= LogError(CreateActionVuid(loc.function, vvl::ActionVUID::PUSH_CONSTANT_08601), objlist, loc,
                                          "Shader in %s uses push-constant statically but vkCmdPushConstants was not called yet.",
                                          string_VkShaderStageFlags(shader_object->create_info.stage).c_str());
                     }

layers/core_checks/cc_external_object.cpp

@@ -110,6 +110,7 @@ bool CoreChecks::PreCallValidateGetSemaphoreFdKHR(VkDevice device, const VkSemap
 
     if (sem_state->ImportedHandleType().has_value() &&
         !CanSemaphoreExportFromImported(pGetFdInfo->handleType, sem_state->ImportedHandleType().value())) {
+        // See https://gitlab.khronos.org/vulkan/vulkan/-/issues/3670 for more details
         skip |= LogError("VUID-VkSemaphoreGetFdInfoKHR-semaphore-01133", sem_state->Handle(), info_loc.dot(Field::handleType),
                          "(%s) cannot be exported from semaphore with imported payload with handle type %s",
                          string_VkExternalSemaphoreHandleTypeFlagBits(pGetFdInfo->handleType),

layers/core_checks/cc_spirv.cpp

@@ -3247,9 +3247,7 @@ bool CoreChecks::ValidateShaderDescriptorSetAndBindingMappingInfo(const spirv::M
                 } info;
 
                 if (base_opcode == spv::OpTypeSampledImage) {
-                    // VUID being added in
-                    // https://gitlab.khronos.org/vulkan/vulkan/-/merge_requests/8242
-                    info.vuid = "UNASSIGNED-VkDescriptorSetAndBindingMappingEXT-combined-image";
+                    info.vuid = "VUID-VkDescriptorSetAndBindingMappingEXT-source-12406";
                     info.align = phys_dev_ext_props.descriptor_heap_props.imageDescriptorAlignment;
                     info.align_field = Field::imageDescriptorAlignment;
                 } else if (base_opcode == spv::OpTypeImage) {

layers/drawdispatch/drawdispatch_vuids.cpp

@@ -772,8 +772,8 @@ std::string CreateActionVuid(vvl::Func function, const ActionVUID id) {
         // ### VUID-vkCmdDraw-imageLayout-00344
         case ActionVUID::IMAGE_LAYOUT_00344: suffix = "imageLayout-00344"; break;
 
-        // ### VUID-vkCmdDraw-maintenance4-08602
-        case ActionVUID::PUSH_CONSTANT_08602: suffix = "maintenance4-08602"; break;
+        // ### VUID-vkCmdDraw-None-08601
+        case ActionVUID::PUSH_CONSTANT_08601: suffix = "None-08601"; break;
 
         // ### VUID-vkCmdDraw-None-08608
         case ActionVUID::DYNAMIC_STATE_ALL_SET_08608: suffix = "None-08608"; break;

layers/drawdispatch/drawdispatch_vuids.h

@@ -132,7 +132,7 @@ enum class ActionVUID {
     FILTER_CUBIC_02694,
     FILTER_CUBIC_02695,
     IMAGE_LAYOUT_00344,
-    PUSH_CONSTANT_08602,
+    PUSH_CONSTANT_08601,
 
     DYNAMIC_STATE_ALL_SET_08608,
     DYNAMIC_DEPTH_COMPARE_OP_07845,