build: Update known good for 1.1.106 header
Changes:
- Integrate upstream script changes: We have to plumb-through the new
conventions object to continue using the makeCParamDecl utility function
- Add `ggp` to platform dictionary
- Workaround for missing platform guard: The XML definition of
VK_KHR_device_group has a single command
vkGetDeviceGroupsSurfacePresentModes2EXT which needs a platform guard.
The current code gen can't guard a subset of an extension so this
workaround manually defines the function with the guard. A more robust
solution to follow.
- Update validation error messages and related files
- Update known good files
Updated:
- `build-android/known_good.json`
- `layers/buffer_validation.cpp`
- `layers/parameter_validation_utils.cpp`
- `layers/stateless_validation.h`
- `layers/vk_validation_error_messages.h`
- `scripts/common_codegen.py`
- `scripts/dispatch_table_helper_generator.py`
- `scripts/helper_file_generator.py`
- `scripts/known_good.json`
- `scripts/layer_chassis_dispatch_generator.py`
- `scripts/layer_chassis_generator.py`
- `scripts/layer_dispatch_table_generator.py`
- `scripts/lvl_genvk.py`
- `scripts/object_tracker_generator.py`
- `scripts/parameter_validation_generator.py`
- `scripts/thread_safety_generator.py`
- `tests/layer_validation_tests.cpp`
Change-Id: I4d67d3e4993d04aa0cb3d5f427da130c82281749
diff --git a/scripts/helper_file_generator.py b/scripts/helper_file_generator.py
index 12084e9..e577ca6 100644
--- a/scripts/helper_file_generator.py
+++ b/scripts/helper_file_generator.py
@@ -1,9 +1,9 @@
#!/usr/bin/python3 -i
#
-# Copyright (c) 2015-2017 The Khronos Group Inc.
-# Copyright (c) 2015-2017 Valve Corporation
-# Copyright (c) 2015-2017 LunarG, Inc.
-# Copyright (c) 2015-2017 Google Inc.
+# Copyright (c) 2015-2019 The Khronos Group Inc.
+# Copyright (c) 2015-2019 Valve Corporation
+# Copyright (c) 2015-2019 LunarG, Inc.
+# Copyright (c) 2015-2019 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
# HelperFileOutputGeneratorOptions - subclass of GeneratorOptions.
class HelperFileOutputGeneratorOptions(GeneratorOptions):
def __init__(self,
+ conventions = None,
filename = None,
directory = '.',
apiname = None,
@@ -53,7 +54,7 @@
library_name = '',
expandEnumerants = True,
helper_file_type = ''):
- GeneratorOptions.__init__(self, filename, directory, apiname, profile,
+ GeneratorOptions.__init__(self, conventions, filename, directory, apiname, profile,
versions, emitversions, defaultExtensions,
addExtensions, removeExtensions, emitExtensions, sortProcedure)
self.prefixText = prefixText
@@ -117,10 +118,10 @@
copyright += '\n'
copyright += '/***************************************************************************\n'
copyright += ' *\n'
- copyright += ' * Copyright (c) 2015-2017 The Khronos Group Inc.\n'
- copyright += ' * Copyright (c) 2015-2017 Valve Corporation\n'
- copyright += ' * Copyright (c) 2015-2017 LunarG, Inc.\n'
- copyright += ' * Copyright (c) 2015-2017 Google Inc.\n'
+ copyright += ' * Copyright (c) 2015-2019 The Khronos Group Inc.\n'
+ copyright += ' * Copyright (c) 2015-2019 Valve Corporation\n'
+ copyright += ' * Copyright (c) 2015-2019 LunarG, Inc.\n'
+ copyright += ' * Copyright (c) 2015-2019 Google Inc.\n'
copyright += ' *\n'
copyright += ' * Licensed under the Apache License, Version 2.0 (the "License");\n'
copyright += ' * you may not use this file except in compliance with the License.\n'
@@ -361,6 +362,8 @@
# Enum_string_header: Create a routine to convert an enumerated value into a string
def GenerateEnumStringConversion(self, groupName, value_list):
outstring = '\n'
+ if self.featureExtraProtect is not None:
+ outstring += '\n#ifdef %s\n\n' % self.featureExtraProtect
outstring += 'static inline const char* string_%s(%s input_value)\n' % (groupName, groupName)
outstring += '{\n'
outstring += ' switch ((%s)input_value)\n' % groupName
@@ -374,6 +377,8 @@
outstring += ' return "Unhandled %s";\n' % groupName
outstring += ' }\n'
outstring += '}\n'
+ if self.featureExtraProtect is not None:
+ outstring += '#endif // %s\n' % self.featureExtraProtect
return outstring
#
# Tack on a helper which, given an index into a VkPhysicalDeviceFeatures structure, will print the corresponding feature name