From 21596cd8dff8766fe7827217c1f9c204bfb223d8 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Mon, 13 Feb 2017 10:15:53 -0700 Subject: header: Update to Vulkan 1.0.40 fixed: - generators for latex math changes updated: - include/vulkan/vk_platform.h - include/vulkan/vulkan.h - scripts/generator.py - scripts/lvl_genvk.py - scripts/reg.py - scripts/vk.xml - include/vulkan/vulkan.hpp - layers/tests json files - loader SOVERSION Change-Id: Id7d6f9dee73888877f2e7528f5701871f54ece79 --- scripts/generator.py | 2 +- scripts/helper_file_generator.py | 8 +-- scripts/lvl_genvk.py | 15 +++--- scripts/parameter_validation_generator.py | 8 +-- scripts/reg.py | 2 +- scripts/vk.xml | 83 ++++++++++++++++++++++++------- 6 files changed, 80 insertions(+), 38 deletions(-) (limited to 'scripts') diff --git a/scripts/generator.py b/scripts/generator.py index 680cd6ac..709ac148 100755 --- a/scripts/generator.py +++ b/scripts/generator.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2013-2016 The Khronos Group Inc. +# Copyright (c) 2013-2017 The Khronos Group Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/scripts/helper_file_generator.py b/scripts/helper_file_generator.py index 3340faf8..39a9aa8c 100644 --- a/scripts/helper_file_generator.py +++ b/scripts/helper_file_generator.py @@ -204,15 +204,15 @@ class HelperFileOutputGenerator(OutputGenerator): name = 'ERROR' decoratedName = 'ERROR' if 'mathit' in source: - # Matches expressions similar to 'latexmath:[$\lceil{\mathit{rasterizationSamples} \over 32}\rceil$]' - match = re.match(r'latexmath\s*\:\s*\[\s*\$\\l(\w+)\s*\{\s*\\mathit\s*\{\s*(\w+)\s*\}\s*\\over\s*(\d+)\s*\}\s*\\r(\w+)\$\s*\]', source) + # Matches expressions similar to 'latexmath:[\lceil{\mathit{rasterizationSamples} \over 32}\rceil]' + match = re.match(r'latexmath\s*\:\s*\[\s*\\l(\w+)\s*\{\s*\\mathit\s*\{\s*(\w+)\s*\}\s*\\over\s*(\d+)\s*\}\s*\\r(\w+)\s*\]', source) if not match or match.group(1) != match.group(4): raise 'Unrecognized latexmath expression' name = match.group(2) decoratedName = '{}/{}'.format(*match.group(2, 3)) else: - # Matches expressions similar to 'latexmath : [$dataSize \over 4$]' - match = re.match(r'latexmath\s*\:\s*\[\s*\$\s*(\w+)\s*\\over\s*(\d+)\s*\$\s*\]', source) + # Matches expressions similar to 'latexmath : [dataSize \over 4]' + match = re.match(r'latexmath\s*\:\s*\[\s*\s*(\w+)\s*\\over\s*(\d+)\s*\s*\]', source) name = match.group(1) decoratedName = '{}/{}'.format(*match.group(1, 2)) return name, decoratedName diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py index f4ef85ee..0be5d3ea 100644 --- a/scripts/lvl_genvk.py +++ b/scripts/lvl_genvk.py @@ -1,7 +1,6 @@ #!/usr/bin/python3 # # Copyright (c) 2013-2017 The Khronos Group Inc. -# Copyright (c) 2015-2017 LunarG, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,9 +17,8 @@ import argparse, cProfile, pdb, string, sys, time from reg import * from generator import write - -# -# LoaderAndValidationLayer Generator Additions +from cgenerator import CGeneratorOptions, COutputGenerator +# LoaderAndValidationLayer Generator Modifications from threading_generator import ThreadGeneratorOptions, ThreadOutputGenerator from parameter_validation_generator import ParamCheckerGeneratorOptions, ParamCheckerOutputGenerator from unique_objects_generator import UniqueObjectsGeneratorOptions, UniqueObjectsOutputGenerator @@ -67,7 +65,7 @@ def makeGenOpts(extensions = [], removeExtensions = [], protect = True, director # Copyright text prefixing all headers (list of strings). prefixStrings = [ '/*', - '** Copyright (c) 2015-2016 The Khronos Group Inc.', + '** Copyright (c) 2015-2017 The Khronos Group Inc.', '**', '** Licensed under the Apache License, Version 2.0 (the "License");', '** you may not use this file except in compliance with the License.', @@ -98,7 +96,8 @@ def makeGenOpts(extensions = [], removeExtensions = [], protect = True, director protectFeature = protect protectProto = protect - # + + # # LoaderAndValidationLayer Generators # Options for threading layer genOpts['thread_check.h'] = [ @@ -295,8 +294,6 @@ def makeGenOpts(extensions = [], removeExtensions = [], protect = True, director helper_file_type = 'safe_struct_source') ] - - # Generate a target based on the options in the matching genOpts{} object. # This is encapsulated in a function so it can be profiled and/or timed. # The args parameter is an parsed argument object containing the following @@ -397,7 +394,7 @@ if __name__ == '__main__': if (args.dump): write('* Dumping registry to regdump.txt', file=sys.stderr) - reg.dumpReg(filehandle = open('regdump.txt','w', encoding='utf-8')) + reg.dumpReg(filehandle = open('regdump.txt', 'w', encoding='utf-8')) # create error/warning & diagnostic files if (args.errfile): diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py index ba03d412..c4b32051 100644 --- a/scripts/parameter_validation_generator.py +++ b/scripts/parameter_validation_generator.py @@ -579,15 +579,15 @@ class ParamCheckerOutputGenerator(OutputGenerator): name = 'ERROR' decoratedName = 'ERROR' if 'mathit' in source: - # Matches expressions similar to 'latexmath:[$\lceil{\mathit{rasterizationSamples} \over 32}\rceil$]' - match = re.match(r'latexmath\s*\:\s*\[\s*\$\\l(\w+)\s*\{\s*\\mathit\s*\{\s*(\w+)\s*\}\s*\\over\s*(\d+)\s*\}\s*\\r(\w+)\$\s*\]', source) + # Matches expressions similar to 'latexmath:[\lceil{\mathit{rasterizationSamples} \over 32}\rceil]' + match = re.match(r'latexmath\s*\:\s*\[\s*\\l(\w+)\s*\{\s*\\mathit\s*\{\s*(\w+)\s*\}\s*\\over\s*(\d+)\s*\}\s*\\r(\w+)\s*\]', source) if not match or match.group(1) != match.group(4): raise 'Unrecognized latexmath expression' name = match.group(2) decoratedName = '{}({}/{})'.format(*match.group(1, 2, 3)) else: - # Matches expressions similar to 'latexmath : [$dataSize \over 4$]' - match = re.match(r'latexmath\s*\:\s*\[\s*\$\s*(\w+)\s*\\over\s*(\d+)\s*\$\s*\]', source) + # Matches expressions similar to 'latexmath : [dataSize \over 4]' + match = re.match(r'latexmath\s*\:\s*\[\s*\s*(\w+)\s*\\over\s*(\d+)\s*\s*\]', source) name = match.group(1) decoratedName = '{}/{}'.format(*match.group(1, 2)) return name, decoratedName diff --git a/scripts/reg.py b/scripts/reg.py index 98436a33..1554c305 100755 --- a/scripts/reg.py +++ b/scripts/reg.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2013-2016 The Khronos Group Inc. +# Copyright (c) 2013-2017 The Khronos Group Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/scripts/vk.xml b/scripts/vk.xml index 779875b8..3a774fa7 100644 --- a/scripts/vk.xml +++ b/scripts/vk.xml @@ -63,6 +63,8 @@ maintained in the master branch of the Khronos Vulkan GitHub project. + + @@ -107,7 +109,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. // Vulkan 1.0 version number #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) // Version of this file -#define VK_HEADER_VERSION 39 +#define VK_HEADER_VERSION 40 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -799,7 +801,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. const void* pNext VkShaderModuleCreateFlags flags size_t codeSize - const uint32_t* pCode + const uint32_t* pCode uint32_t binding @@ -927,7 +929,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. VkSampleCountFlagBits rasterizationSamples VkBool32 sampleShadingEnable float minSampleShading - const VkSampleMask* pSampleMask + const VkSampleMask* pSampleMask VkBool32 alphaToCoverageEnable VkBool32 alphaToOneEnable @@ -1538,7 +1540,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. const VkSemaphore* pWaitSemaphores uint32_t swapchainCount const VkSwapchainKHR* pSwapchains - const uint32_t* pImageIndices + const uint32_t* pImageIndices VkResult* pResults @@ -1825,6 +1827,20 @@ maintained in the master branch of the Khronos Vulkan GitHub project. const void* pNext VkSurfaceCounterFlagsEXT surfaceCounters + + + float x + float y + + + + VkXYColorEXT displayPrimaryRed + VkXYColorEXT displayPrimaryGreen + VkXYColorEXT displayPrimaryBlue + VkXYColorEXT whitePoint + float maxLuminance + float minLuminance + @@ -4088,6 +4104,13 @@ maintained in the master branch of the Khronos Vulkan GitHub project. VkSurfaceKHR surface VkSurfaceCapabilities2EXT* pSurfaceCapabilities + + void vkSetSMPTE2086MetadataEXT + VkDevice device + uint32_t swapchainCount + const VkSwapchainKHR* pSwapchains + const VkSMPTE2086MetadataEXT* pMetadata + @@ -4460,7 +4483,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + @@ -4540,13 +4563,14 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + - + + @@ -4806,7 +4830,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + @@ -4851,7 +4875,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + @@ -4867,13 +4891,13 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + - + @@ -4897,7 +4921,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + @@ -5175,10 +5199,10 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + - - + + @@ -5188,15 +5212,18 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + - + - - + + + + + @@ -5265,5 +5292,23 @@ maintained in the master branch of the Khronos Vulkan GitHub project. + + + + + + + + + + + + + + + + + + -- cgit v1.2.3