From d005be382d63e8722bba86aaa7cd03e0ad75a210 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Mon, 8 Jan 2018 08:17:24 -0700 Subject: header: Update to version 1.0.67 of the Vulkan hdr - updated vulkan.h - updated cgenerator.py - updated generator.py - updated reg.py - updated vk.xml - updated layer json files - updated vulkan.hpp - updated vuid_mapping.py - updated vk_validation_error_database.txt for spec changes, new VUIDs - updated vk_validation_error_messages.h Change-Id: Ifb67cf406aa82bf89e72ccfa4e1320cb3b199656 --- scripts/cgenerator.py | 2 +- scripts/generator.py | 2 +- scripts/reg.py | 4 +-- scripts/vk.xml | 80 ++++++++++++++++++++++++++++++++++++++++++++----- scripts/vuid_mapping.py | 5 ++++ 5 files changed, 81 insertions(+), 12 deletions(-) (limited to 'scripts') diff --git a/scripts/cgenerator.py b/scripts/cgenerator.py index 534e024f..5a82acf7 100644 --- a/scripts/cgenerator.py +++ b/scripts/cgenerator.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2013-2017 The Khronos Group Inc. +# Copyright (c) 2013-2018 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/generator.py b/scripts/generator.py index a9a7bd58..c5745986 100755 --- a/scripts/generator.py +++ b/scripts/generator.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2013-2017 The Khronos Group Inc. +# Copyright (c) 2013-2018 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/reg.py b/scripts/reg.py index a591380b..afcca4e3 100755 --- a/scripts/reg.py +++ b/scripts/reg.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2013-2017 The Khronos Group Inc. +# Copyright (c) 2013-2018 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. @@ -734,7 +734,7 @@ class Registry: if (include): ei.emit = True features.append(ei) - + # Hack - can be removed when validity generator goes away self.requiredextensions.append(extName) else: diff --git a/scripts/vk.xml b/scripts/vk.xml index c0869973..e219c36b 100644 --- a/scripts/vk.xml +++ b/scripts/vk.xml @@ -1,7 +1,7 @@ -Copyright (c) 2015-2017 The Khronos Group Inc. +Copyright (c) 2015-2018 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. @@ -107,7 +107,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. // Vulkan 1.0 version number #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 66 +#define VK_HEADER_VERSION 67 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -245,6 +245,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. typedef VkFlags VkPipelineCoverageToColorStateCreateFlagsNV; typedef VkFlags VkPipelineCoverageModulationStateCreateFlagsNV; typedef VkFlags VkValidationCacheCreateFlagsEXT; + typedef VkFlags VkPipelineRasterizationConservativeStateCreateFlagsEXT; Types which can be void pointers or class pointers, selected at compile time VK_DEFINE_HANDLE(VkInstance) @@ -388,6 +389,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. + WSI extensions @@ -2662,6 +2664,27 @@ private version is maintained in the 1.0 branch of the member gitlab server. void* pNext VkDeviceSize minImportedHostPointerAlignment + + VkStructureType sType + void* pNextPointer to next structure + float primitiveOverestimationSizeThe size in pixels the primitive is enlarged at each edge during conservative rasterization + float maxExtraPrimitiveOverestimationSizeThe maximum additional overestimation the client can specify in the pipeline state + float extraPrimitiveOverestimationSizeGranularityThe granularity of extra overestimation sizes the implementations supports between 0 and maxExtraOverestimationSize + VkBool32 primitiveUnderestimationtrue if the implementation supports conservative rasterization underestimation mode + VkBool32 conservativePointAndLineRasterizationtrue if conservative rasterization also applies to points and lines + VkBool32 degenerateTrianglesRasterizedtrue if degenerate triangles (those with zero area after snap) are rasterized + VkBool32 degenerateLinesRasterizedtrue if degenerate lines (those with zero length after snap) are rasterized + VkBool32 fullyCoveredFragmentShaderInputVariabletrue if the implementation supports the FullyCoveredEXT SPIR-V builtin fragment shader input + variable + VkBool32 conservativeRasterizationPostDepthCoveragetrue if the implementation supports both conservative rasterization and post depth coverage sample coverage mask + + + VkStructureType sType + const void* pNext + VkPipelineRasterizationConservativeStateCreateFlagsEXT flags + VkConservativeRasterizationModeEXT conservativeRasterizationMode + float extraPrimitiveOverestimationSize + Vulkan enumerant (token) definitions @@ -3700,6 +3723,11 @@ private version is maintained in the 1.0 branch of the member gitlab server. + + + + + @@ -4320,7 +4348,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkCommandBuffer commandBuffer uint32_t firstViewport uint32_t viewportCount - const VkViewport* pViewports + const VkViewport* pViewports void vkCmdSetScissor @@ -5301,7 +5329,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkSwapchainKHR swapchain VkRefreshCycleDurationGOOGLE* pDisplayTimingProperties - + VkResult vkGetPastPresentationTimingGOOGLE VkDevice device VkSwapchainKHR swapchain @@ -5327,7 +5355,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkCommandBuffer commandBuffer uint32_t firstViewport uint32_t viewportCount - const VkViewportWScalingNV* pViewportWScalings + const VkViewportWScalingNV* pViewportWScalings void vkCmdSetDiscardRectangleEXT @@ -6734,10 +6762,16 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + + + + + + + @@ -7559,5 +7593,35 @@ private version is maintained in the 1.0 branch of the member gitlab server. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/vuid_mapping.py b/scripts/vuid_mapping.py index 9c9324e3..89741846 100644 --- a/scripts/vuid_mapping.py +++ b/scripts/vuid_mapping.py @@ -578,6 +578,8 @@ func_struct_id_map = { 'VkMemoryHostPointerPropertiesEXT' : 522, 'VkPhysicalDeviceExternalMemoryHostPropertiesEXT' : 523, 'vkGetMemoryHostPointerPropertiesEXT' : 524, +'VkPhysicalDeviceConservativeRasterizationPropertiesEXT' : 525, +'VkPipelineRasterizationConservativeStateCreateInfoEXT' : 526, ### ADD New func/struct mappings above this line } # Mapping of params to unique IDs @@ -1090,6 +1092,9 @@ implicit_param_map = { 'shaderStageMask' : 505, 'pMemoryHostPointerProperties' : 506, 'pHostPointer' : 507, +'conservativeRasterizationMode' : 508, +'pViewports' : 509, +'pViewportWScalings' : 510, ### ADD New implicit param mappings above this line } -- cgit v1.2.3