From 6d8f070828f028a8e960072d32d84cb490d9809c Mon Sep 17 00:00:00 2001
From: Dustin Graves <dustin@lunarg.com>
Date: Thu, 30 Mar 2017 15:42:16 -0600
Subject: [PATCH] layers: Fix WriteDescriptorSet::dstSet validation
VkWriteDescriptorSet::dstSet is ignored by vkCmdPushDescriptorSetsKHR,
so the 'must not be a null handle' validation for dstSet has been moved
from the code validating the VkWriteDescriptor struct members to the
code validating the vkUpdateDescriptorSets function parameters.
Change-Id: Ia6f11d33e4d57d4c848aab72cfd91da5d5a15a30
---
layers/parameter_validation.cpp | 5 +++++
scripts/parameter_validation_generator.py | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/layers/parameter_validation.cpp b/layers/parameter_validation.cpp
index bc41f1255..0edce558f 100644
--- a/layers/parameter_validation.cpp
+++ b/layers/parameter_validation.cpp
@@ -3792,6 +3792,11 @@ VKAPI_ATTR void VKAPI_CALL UpdateDescriptorSets(VkDevice device, uint32_t descri
i, validation_error_map[VALIDATION_ERROR_00957]);
}
+ // dstSet must be a valid VkDescriptorSet handle
+ skip |= validate_required_handle(report_data, "vkUpdateDescriptorSets",
+ ParameterName("pDescriptorWrites[%i].dstSet", ParameterName::IndexVector{i}),
+ pDescriptorWrites[i].dstSet);
+
if ((pDescriptorWrites[i].descriptorType == VK_DESCRIPTOR_TYPE_SAMPLER) ||
(pDescriptorWrites[i].descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER) ||
(pDescriptorWrites[i].descriptorType == VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE) ||
diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
index 1d0dec814..57e5551db 100644
--- a/scripts/parameter_validation_generator.py
+++ b/scripts/parameter_validation_generator.py
@@ -136,6 +136,8 @@ class ParamCheckerOutputGenerator(OutputGenerator):
'vkEnumerateDeviceExtensionsProperties',
'vkCreateDebugReportCallbackEXT',
'vkDebugReportMessageEXT']
+ # Structure fields to ignore
+ self.structMemberBlacklist = { 'VkWriteDescriptorSet' : ['dstSet'] }
# Validation conditions for some special case struct members that are conditionally validated
self.structMemberValidationConditions = { 'VkPipelineColorBlendStateCreateInfo' : { 'logicOp' : '{}logicOpEnable == VK_TRUE' } }
# Header version
@@ -360,6 +362,10 @@ class ParamCheckerOutputGenerator(OutputGenerator):
isoptional = False
if self.paramIsOptional(member) or (name == 'pNext') or (isstaticarray):
isoptional = True
+ # Determine if value should be ignored by code generation.
+ noautovalidity = False
+ if (member.attrib.get('noautovalidity') is not None) or ((typeName in self.structMemberBlacklist) and (name in self.structMemberBlacklist[typeName])):
+ noautovalidity = True
membersInfo.append(self.CommandParam(type=type, name=name,
ispointer=self.paramIsPointer(member),
isstaticarray=isstaticarray,
@@ -368,7 +374,7 @@ class ParamCheckerOutputGenerator(OutputGenerator):
isconst=True if 'const' in cdecl else False,
isoptional=isoptional,
iscount=iscount,
- noautovalidity=True if member.attrib.get('noautovalidity') is not None else False,
+ noautovalidity=noautovalidity,
len=self.getLen(member),
extstructs=member.attrib.get('validextensionstructs') if name == 'pNext' else None,
condition=conditions[name] if conditions and name in conditions else None,
--
GitLab