aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMark Lobodzinski <mark@lunarg.com>2017-06-28 11:47:22 -0600
committerMark Lobodzinski <mark@lunarg.com>2017-07-03 14:00:45 -0600
commit3efad33bc94e6ab74bcc8aadbf24aede15461c7f (patch)
tree350e4014cb49d8bc9b0821c6c534afa42ab14777 /scripts
parent10fc831ef90f8a532971bfb9f9442e1820f5d98a (diff)
downloadusermoji-3efad33bc94e6ab74bcc8aadbf24aede15461c7f.tar.xz
layers: Wire up ranged-enum PV VUIDs
Change-Id: I334357b239a6f2ad28fad226306897606814095a
Diffstat (limited to 'scripts')
-rw-r--r--scripts/parameter_validation_generator.py3
-rw-r--r--scripts/vuid_mapping.py4
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
index 5268194d..e7fdf8a8 100644
--- a/scripts/parameter_validation_generator.py
+++ b/scripts/parameter_validation_generator.py
@@ -1048,7 +1048,8 @@ class ParamCheckerOutputGenerator(OutputGenerator):
usedLines.append('skipCall |= validate_bool32(layer_data->report_data, "{}", {ppp}"{}"{pps}, {}{});\n'.format(funcName, valueDisplayName, valuePrefix, value.name, **postProcSpec))
elif value.israngedenum:
enumRange = self.enumRanges[value.type]
- usedLines.append('skipCall |= validate_ranged_enum(layer_data->report_data, "{}", {ppp}"{}"{pps}, "{}", {}, {}, {}{});\n'.format(funcName, valueDisplayName, value.type, enumRange[0], enumRange[1], valuePrefix, value.name, **postProcSpec))
+ vuid = self.GetVuid("VUID-%s-%s-parameter" % (vuid_name_tag, value.name))
+ usedLines.append('skipCall |= validate_ranged_enum(layer_data->report_data, "{}", {ppp}"{}"{pps}, "{}", {}, {}, {}{}, {});\n'.format(funcName, valueDisplayName, value.type, enumRange[0], enumRange[1], valuePrefix, value.name, vuid, **postProcSpec))
#
# If this is a struct, see if it contains members that need to be checked
if value.type in self.validatedStructs:
diff --git a/scripts/vuid_mapping.py b/scripts/vuid_mapping.py
index 30841571..a599b977 100644
--- a/scripts/vuid_mapping.py
+++ b/scripts/vuid_mapping.py
@@ -509,6 +509,8 @@ func_struct_id_map = {
'VkPipelineCoverageModulationStateCreateInfoNV' : 453,
'VkPipelineCoverageToColorStateCreateInfoNV' : 454,
'VkSamplerReductionModeCreateInfoEXT' : 455,
+'VkPhysicalDeviceProperties' : 456,
+'VkSurfaceFormatKHR' : 457,
### ADD New func/struct mappings above this line
}
# Mapping of params to unique IDs
@@ -966,6 +968,8 @@ implicit_param_map = {
'physicalDeviceCount' : 450,
'waitSemaphoreValuesCount' : 451,
'signalSemaphoreValuesCount' : 452,
+'deviceType' : 453,
+'colorSpace' : 454,
### ADD New implicit param mappings above this line
}