stateless: Move manual checks AFTER implicit VUs
Doing so will help to guard the manual checks from nullptr accesses,
as the code-generated implicit VU checks do this automatically.
Change-Id: Ifa978b6219ad0a3588285caf1c5314746edc5d0a
diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
index 0931584..74a911a 100644
--- a/scripts/parameter_validation_generator.py
+++ b/scripts/parameter_validation_generator.py
@@ -1276,6 +1276,12 @@
func_sig = func_sig.split('VKAPI_CALL vk')[1]
cmdDef = 'bool StatelessValidation::PreCallValidate' + func_sig
cmdDef += '%sbool skip = false;\n' % indent
+ for line in lines:
+ if type(line) is list:
+ for sub in line:
+ cmdDef += indent + sub
+ else:
+ cmdDef += indent + line
# Insert call to custom-written function if present
if command.name in self.functions_with_manual_checks:
# Generate parameter list for manual fcn and down-chain calls
@@ -1284,12 +1290,6 @@
params_text += '%s, ' % param.name
params_text = params_text[:-2] + ');\n'
cmdDef += ' skip |= manual_PreCallValidate'+ command.name[2:] + '(' + params_text
- for line in lines:
- if type(line) is list:
- for sub in line:
- cmdDef += indent + sub
- else:
- cmdDef += indent + line
cmdDef += '%sreturn skip;\n' % indent
cmdDef += '}\n'
self.validation.append(cmdDef)