diff options
| author | Mark Young <marky@lunarg.com> | 2018-03-21 13:35:34 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2018-03-28 13:06:22 -0600 |
| commit | 85333bceb224885a6a115cf85d6d209a49c4854d (patch) | |
| tree | 324298d9307fe06f1a8bb887338823a6d63c740b /scripts | |
| parent | d684b8d9caf4dc9d97db16eee1bb15cdf7a7d1a2 (diff) | |
| download | usermoji-85333bceb224885a6a115cf85d6d209a49c4854d.tar.xz | |
layers: Fix gh #2504 and compiler warnings
Remove extraneous objecgt info from the validation logging message.
Extra object logging was added accidentally in my change to
incorporate VK_EXT_debug_utils.
Fix output of Debug Utils messenger output for validation layers
to list individual objects.
Also, fixed a few compiler warnings that were appearing on Linux.
Change-Id: I043d7f734683dfa79fe7a26a5973975bde011cce
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/helper_file_generator.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/helper_file_generator.py b/scripts/helper_file_generator.py index ea4800d0..794864d9 100644 --- a/scripts/helper_file_generator.py +++ b/scripts/helper_file_generator.py @@ -668,7 +668,7 @@ class HelperFileOutputGenerator(OutputGenerator): # Create a function to convert from VkDebugReportObjectTypeEXT to VkObjectType object_types_header += '\n' object_types_header += '// Helper function to convert from VkDebugReportObjectTypeEXT to VkObjectType\n' - object_types_header += 'static VkObjectType convertDebugReportObjectToCoreObject(VkDebugReportObjectTypeEXT debug_report_obj){\n' + object_types_header += 'static inline VkObjectType convertDebugReportObjectToCoreObject(VkDebugReportObjectTypeEXT debug_report_obj){\n' object_types_header += ' if (debug_report_obj == VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT) {\n' object_types_header += ' return VK_OBJECT_TYPE_UNKNOWN;\n' for core_object_type in self.core_object_types: @@ -689,7 +689,7 @@ class HelperFileOutputGenerator(OutputGenerator): # Create a function to convert from VkObjectType to VkDebugReportObjectTypeEXT object_types_header += '\n' object_types_header += '// Helper function to convert from VkDebugReportObjectTypeEXT to VkObjectType\n' - object_types_header += 'static VkDebugReportObjectTypeEXT convertCoreObjectToDebugReportObject(VkObjectType core_report_obj){\n' + object_types_header += 'static inline VkDebugReportObjectTypeEXT convertCoreObjectToDebugReportObject(VkObjectType core_report_obj){\n' object_types_header += ' if (core_report_obj == VK_OBJECT_TYPE_UNKNOWN) {\n' object_types_header += ' return VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT;\n' for core_object_type in self.core_object_types: |