From ec2db85225ab410bc6829251bef6c578aaed5868 Mon Sep 17 00:00:00 2001 From: Jon Leech Date: Tue, 2 Feb 2021 01:30:19 -0800 Subject: Update for Vulkan-Docs 1.2.169 --- registry/cgenerator.py | 2 +- registry/conventions.py | 2 +- registry/generator.py | 2 +- registry/genvk.py | 4 +- registry/reg.py | 2 +- registry/spec_tools/util.py | 4 +- registry/validusage.json | 162 ++++++++++++++++++-------------------------- registry/vk.xml | 52 +++++++------- registry/vkconventions.py | 2 +- 9 files changed, 102 insertions(+), 130 deletions(-) mode change 100755 => 100644 registry/vk.xml (limited to 'registry') diff --git a/registry/cgenerator.py b/registry/cgenerator.py index 11d5468..c156f22 100644 --- a/registry/cgenerator.py +++ b/registry/cgenerator.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2013-2020 The Khronos Group Inc. +# Copyright 2013-2021 The Khronos Group Inc. # # SPDX-License-Identifier: Apache-2.0 diff --git a/registry/conventions.py b/registry/conventions.py index 6de7348..edf9059 100644 --- a/registry/conventions.py +++ b/registry/conventions.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2013-2020 The Khronos Group Inc. +# Copyright 2013-2021 The Khronos Group Inc. # # SPDX-License-Identifier: Apache-2.0 diff --git a/registry/generator.py b/registry/generator.py index 635ff81..18bc417 100644 --- a/registry/generator.py +++ b/registry/generator.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2013-2020 The Khronos Group Inc. +# Copyright 2013-2021 The Khronos Group Inc. # # SPDX-License-Identifier: Apache-2.0 """Base class for source/header/doc generators, as well as some utility functions.""" diff --git a/registry/genvk.py b/registry/genvk.py index 5b284f0..a3b47b9 100755 --- a/registry/genvk.py +++ b/registry/genvk.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -# Copyright (c) 2013-2020 The Khronos Group Inc. +# Copyright 2013-2021 The Khronos Group Inc. # # SPDX-License-Identifier: Apache-2.0 @@ -104,7 +104,7 @@ def makeGenOpts(args): # The SPDX formatting below works around constraints of the 'reuse' tool prefixStrings = [ '/*', - '** Copyright (c) 2015-2020 The Khronos Group Inc.', + '** Copyright 2015-2021 The Khronos Group Inc.', '**', '** SPDX' + '-License-Identifier: Apache-2.0', '*/', diff --git a/registry/reg.py b/registry/reg.py index 075614f..5ed7c29 100644 --- a/registry/reg.py +++ b/registry/reg.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -i # -# Copyright 2013-2020 The Khronos Group Inc. +# Copyright 2013-2021 The Khronos Group Inc. # # SPDX-License-Identifier: Apache-2.0 diff --git a/registry/spec_tools/util.py b/registry/spec_tools/util.py index ce11fd7..b890679 100644 --- a/registry/spec_tools/util.py +++ b/registry/spec_tools/util.py @@ -1,6 +1,6 @@ """Utility functions not closely tied to other spec_tools types.""" -# Copyright (c) 2018-2019 Collabora, Ltd. -# Copyright (c) 2013-2020 The Khronos Group Inc. +# Copyright 2018-2019 Collabora, Ltd. +# Copyright 2013-2021 The Khronos Group Inc. # # SPDX-License-Identifier: Apache-2.0 diff --git a/registry/validusage.json b/registry/validusage.json index 62728e1..e80c628 100644 --- a/registry/validusage.json +++ b/registry/validusage.json @@ -1,9 +1,9 @@ { "version info": { "schema version": 2, - "api version": "1.2.168", - "comment": "from git branch: github-main commit: cd10a156f111cfc930c1821cc41b987661a22c76", - "date": "2021-01-25 04:50:56Z" + "api version": "1.2.169", + "comment": "from git branch: github-main commit: 1eae55f4c780fb0f0aa990071fe158d2a70e7429", + "date": "2021-02-02 06:53:27Z" }, "validation": { "vkGetInstanceProcAddr": { @@ -1388,7 +1388,7 @@ }, { "vuid": "VUID-VkSubmitInfo-pNext-04148", - "text": " If the pNext chain of this structure includes a VkProtectedSubmitInfo structure with protectedSubmit set to VK_TRUE, then each element of the pCommandBuffers array must be an protected command buffer" + "text": " If the pNext chain of this structure includes a VkProtectedSubmitInfo structure with protectedSubmit set to VK_TRUE, then each element of the pCommandBuffers array must be a protected command buffer" } ] }, @@ -4080,7 +4080,7 @@ }, { "vuid": "VUID-VkSubpassDescription-pDepthStencilAttachment-02650", - "text": " If pDepthStencilAttachment is not NULL and the attachment is not VK_ATTACHMENT_UNUSED then it must have a image format whose potential format features contain VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT" + "text": " If pDepthStencilAttachment is not NULL and the attachment is not VK_ATTACHMENT_UNUSED then it must have an image format whose potential format features contain VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT" }, { "vuid": "VUID-VkSubpassDescription-pDepthStencilAttachment-01418", @@ -4618,7 +4618,7 @@ }, { "vuid": "VUID-VkSubpassDescription2-pDepthStencilAttachment-02900", - "text": " If pDepthStencilAttachment is not NULL and the attachment is not VK_ATTACHMENT_UNUSED then it must have a image format whose potential format features contain VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT" + "text": " If pDepthStencilAttachment is not NULL and the attachment is not VK_ATTACHMENT_UNUSED then it must have an image format whose potential format features contain VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT" }, { "vuid": "VUID-VkSubpassDescription2-pDepthStencilAttachment-03071", @@ -5584,10 +5584,6 @@ "vuid": "VUID-VkRenderPassBeginInfo-framebuffer-parameter", "text": " framebuffer must be a valid VkFramebuffer handle" }, - { - "vuid": "VUID-VkRenderPassBeginInfo-pClearValues-parameter", - "text": " If clearValueCount is not 0, pClearValues must be a valid pointer to an array of clearValueCount VkClearValue unions" - }, { "vuid": "VUID-VkRenderPassBeginInfo-commonparent", "text": " Both of framebuffer, and renderPass must have been created, allocated, or retrieved from the same VkDevice" @@ -18228,10 +18224,6 @@ "vuid": "VUID-vkCmdClearColorImage-imageLayout-parameter", "text": " imageLayout must be a valid VkImageLayout value" }, - { - "vuid": "VUID-vkCmdClearColorImage-pColor-parameter", - "text": " pColor must be a valid pointer to a valid VkClearColorValue union" - }, { "vuid": "VUID-vkCmdClearColorImage-pRanges-parameter", "text": " pRanges must be a valid pointer to an array of rangeCount valid VkImageSubresourceRange structures" @@ -19736,14 +19728,6 @@ "vuid": "VUID-vkCmdCopyBufferToImage-imageOffset-01793", "text": " The imageOffset and imageExtent members of each element of pRegions must respect the image transfer granularity requirements of commandBuffer’s command pool’s queue family, as described in VkQueueFamilyProperties" }, - { - "vuid": "VUID-vkCmdCopyBufferToImage-commandBuffer-04052", - "text": " If the queue family used to create the VkCommandPool which commandBuffer was allocated from does not support VK_QUEUE_GRAPHICS_BIT or VK_QUEUE_COMPUTE_BIT, the bufferOffset member of any element of pRegions must be a multiple of 4" - }, - { - "vuid": "VUID-vkCmdCopyBufferToImage-dstImage-04053", - "text": " If dstImage has a depth/stencil format, the bufferOffset member of any element of pRegions must be a multiple of 4" - }, { "vuid": "VUID-vkCmdCopyBufferToImage-commandBuffer-04477", "text": " If the queue family used to create the VkCommandPool which commandBuffer was allocated from does not support VK_QUEUE_GRAPHICS_BIT, for each element of pRegions, the aspectMask member of imageSubresource must not be VK_IMAGE_ASPECT_DEPTH_BIT or VK_IMAGE_ASPECT_STENCIL_BIT." @@ -19812,6 +19796,14 @@ "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-04726", "text": " If {imageparam} is a blocked image, for each element of pRegions, bufferRowLength divided by the compressed texel block width and then multiplied by the texel block size of {imageparam} must be less than or equal to 231-1" }, + { + "vuid": "VUID-vkCmdCopyBufferToImage-commandBuffer-04052", + "text": " If the queue family used to create the VkCommandPool which commandBuffer was allocated from does not support VK_QUEUE_GRAPHICS_BIT or VK_QUEUE_COMPUTE_BIT, the bufferOffset member of any element of pRegions must be a multiple of 4" + }, + { + "vuid": "VUID-vkCmdCopyBufferToImage-srcImage-04053", + "text": " If {imageparam} has a depth/stencil format, the bufferOffset member of any element of pRegions must be a multiple of 4" + }, { "vuid": "VUID-vkCmdCopyBufferToImage-commandBuffer-parameter", "text": " commandBuffer must be a valid VkCommandBuffer handle" @@ -19968,14 +19960,6 @@ "vuid": "VUID-vkCmdCopyImageToBuffer-imageOffset-01794", "text": " The imageOffset and imageExtent members of each element of pRegions must respect the image transfer granularity requirements of commandBuffer’s command pool’s queue family, as described in VkQueueFamilyProperties" }, - { - "vuid": "VUID-vkCmdCopyImageToBuffer-commandBuffer-04054", - "text": " If the queue family used to create the VkCommandPool which commandBuffer was allocated from does not support VK_QUEUE_GRAPHICS_BIT or VK_QUEUE_COMPUTE_BIT, the bufferOffset member of any element of pRegions must be a multiple of 4" - }, - { - "vuid": "VUID-vkCmdCopyImageToBuffer-srcImage-04055", - "text": " If srcImage has a depth/stencil format, the bufferOffset member of any element of pRegions must be a multiple of 4" - }, { "vuid": "VUID-vkCmdCopyImageToBuffer-imageOffset-00197", "text": " For each element of pRegions , imageOffset.x and (imageExtent.width + imageOffset.x) must both be greater than or equal to 0 and less than or equal to the width of the specified imageSubresource of srcImage" @@ -20040,6 +20024,14 @@ "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-04726", "text": " If {imageparam} is a blocked image, for each element of pRegions, bufferRowLength divided by the compressed texel block width and then multiplied by the texel block size of {imageparam} must be less than or equal to 231-1" }, + { + "vuid": "VUID-vkCmdCopyImageToBuffer-commandBuffer-04052", + "text": " If the queue family used to create the VkCommandPool which commandBuffer was allocated from does not support VK_QUEUE_GRAPHICS_BIT or VK_QUEUE_COMPUTE_BIT, the bufferOffset member of any element of pRegions must be a multiple of 4" + }, + { + "vuid": "VUID-vkCmdCopyImageToBuffer-srcImage-04053", + "text": " If {imageparam} has a depth/stencil format, the bufferOffset member of any element of pRegions must be a multiple of 4" + }, { "vuid": "VUID-vkCmdCopyImageToBuffer-commandBuffer-parameter", "text": " commandBuffer must be a valid VkCommandBuffer handle" @@ -20254,14 +20246,6 @@ "vuid": "VUID-VkCopyBufferToImageInfo2KHR-imageOffset-01793", "text": " The imageOffset and imageExtent members of each element of pRegions must respect the image transfer granularity requirements of commandBuffer’s command pool’s queue family, as described in VkQueueFamilyProperties" }, - { - "vuid": "VUID-VkCopyBufferToImageInfo2KHR-commandBuffer-04052", - "text": " If the queue family used to create the VkCommandPool which commandBuffer was allocated from does not support VK_QUEUE_GRAPHICS_BIT or VK_QUEUE_COMPUTE_BIT, the bufferOffset member of any element of pRegions must be a multiple of 4" - }, - { - "vuid": "VUID-VkCopyBufferToImageInfo2KHR-dstImage-04053", - "text": " If dstImage has a depth/stencil format, the bufferOffset member of any element of pRegions must be a multiple of 4" - }, { "vuid": "VUID-VkCopyBufferToImageInfo2KHR-commandBuffer-04477", "text": " If the queue family used to create the VkCommandPool which commandBuffer was allocated from does not support VK_QUEUE_GRAPHICS_BIT, for each element of pRegions, the aspectMask member of imageSubresource must not be VK_IMAGE_ASPECT_DEPTH_BIT or VK_IMAGE_ASPECT_STENCIL_BIT." @@ -20329,6 +20313,14 @@ { "vuid": "VUID-VkCopyBufferToImageInfo2KHR-pRegions-04726", "text": " If {imageparam} is a blocked image, for each element of pRegions, bufferRowLength divided by the compressed texel block width and then multiplied by the texel block size of {imageparam} must be less than or equal to 231-1" + }, + { + "vuid": "VUID-VkCopyBufferToImageInfo2KHR-commandBuffer-04052", + "text": " If the queue family used to create the VkCommandPool which commandBuffer was allocated from does not support VK_QUEUE_GRAPHICS_BIT or VK_QUEUE_COMPUTE_BIT, the bufferOffset member of any element of pRegions must be a multiple of 4" + }, + { + "vuid": "VUID-VkCopyBufferToImageInfo2KHR-srcImage-04053", + "text": " If {imageparam} has a depth/stencil format, the bufferOffset member of any element of pRegions must be a multiple of 4" } ], "(VK_VERSION_1_1,VK_KHR_maintenance1)": [ @@ -20524,14 +20516,6 @@ "vuid": "VUID-VkCopyImageToBufferInfo2KHR-imageOffset-01794", "text": " The imageOffset and imageExtent members of each element of pRegions must respect the image transfer granularity requirements of commandBuffer’s command pool’s queue family, as described in VkQueueFamilyProperties" }, - { - "vuid": "VUID-VkCopyImageToBufferInfo2KHR-commandBuffer-04054", - "text": " If the queue family used to create the VkCommandPool which commandBuffer was allocated from does not support VK_QUEUE_GRAPHICS_BIT or VK_QUEUE_COMPUTE_BIT, the bufferOffset member of any element of pRegions must be a multiple of 4" - }, - { - "vuid": "VUID-VkCopyImageToBufferInfo2KHR-srcImage-04055", - "text": " If srcImage has a depth/stencil format, the bufferOffset member of any element of pRegions must be a multiple of 4" - }, { "vuid": "VUID-VkCopyImageToBufferInfo2KHR-imageOffset-00197", "text": " For each element of pRegions" @@ -20595,6 +20579,14 @@ { "vuid": "VUID-VkCopyImageToBufferInfo2KHR-pRegions-04726", "text": " If {imageparam} is a blocked image, for each element of pRegions, bufferRowLength divided by the compressed texel block width and then multiplied by the texel block size of {imageparam} must be less than or equal to 231-1" + }, + { + "vuid": "VUID-VkCopyImageToBufferInfo2KHR-commandBuffer-04052", + "text": " If the queue family used to create the VkCommandPool which commandBuffer was allocated from does not support VK_QUEUE_GRAPHICS_BIT or VK_QUEUE_COMPUTE_BIT, the bufferOffset member of any element of pRegions must be a multiple of 4" + }, + { + "vuid": "VUID-VkCopyImageToBufferInfo2KHR-srcImage-04053", + "text": " If {imageparam} has a depth/stencil format, the bufferOffset member of any element of pRegions must be a multiple of 4" } ], "(VK_VERSION_1_1,VK_KHR_maintenance1)": [ @@ -32480,10 +32472,6 @@ "vuid": "VUID-VkAccelerationStructureBuildGeometryInfoKHR-ppGeometries-parameter", "text": " If geometryCount is not 0, and ppGeometries is not NULL, ppGeometries must be a valid pointer to an array of geometryCount valid pointers to valid VkAccelerationStructureGeometryKHR structures" }, - { - "vuid": "VUID-VkAccelerationStructureBuildGeometryInfoKHR-scratchData-parameter", - "text": " scratchData must be a valid VkDeviceOrHostAddressKHR union" - }, { "vuid": "VUID-VkAccelerationStructureBuildGeometryInfoKHR-commonparent", "text": " Both of dstAccelerationStructure, and srcAccelerationStructure that are valid handles of non-ignored parameters must have been created, allocated, or retrieved from the same VkDevice" @@ -32564,21 +32552,9 @@ "vuid": "VUID-VkAccelerationStructureGeometryTrianglesDataKHR-vertexFormat-parameter", "text": " vertexFormat must be a valid VkFormat value" }, - { - "vuid": "VUID-VkAccelerationStructureGeometryTrianglesDataKHR-vertexData-parameter", - "text": " vertexData must be a valid VkDeviceOrHostAddressConstKHR union" - }, { "vuid": "VUID-VkAccelerationStructureGeometryTrianglesDataKHR-indexType-parameter", "text": " indexType must be a valid VkIndexType value" - }, - { - "vuid": "VUID-VkAccelerationStructureGeometryTrianglesDataKHR-indexData-parameter", - "text": " indexData must be a valid VkDeviceOrHostAddressConstKHR union" - }, - { - "vuid": "VUID-VkAccelerationStructureGeometryTrianglesDataKHR-transformData-parameter", - "text": " transformData must be a valid VkDeviceOrHostAddressConstKHR union" } ] }, @@ -32607,10 +32583,6 @@ { "vuid": "VUID-VkAccelerationStructureGeometryAabbsDataKHR-pNext-pNext", "text": " pNext must be NULL" - }, - { - "vuid": "VUID-VkAccelerationStructureGeometryAabbsDataKHR-data-parameter", - "text": " data must be a valid VkDeviceOrHostAddressConstKHR union" } ] }, @@ -32639,10 +32611,6 @@ { "vuid": "VUID-VkAccelerationStructureGeometryInstancesDataKHR-pNext-pNext", "text": " pNext must be NULL" - }, - { - "vuid": "VUID-VkAccelerationStructureGeometryInstancesDataKHR-data-parameter", - "text": " data must be a valid VkDeviceOrHostAddressConstKHR union" } ] }, @@ -32994,10 +32962,6 @@ "vuid": "VUID-VkCopyAccelerationStructureToMemoryInfoKHR-src-parameter", "text": " src must be a valid VkAccelerationStructureKHR handle" }, - { - "vuid": "VUID-VkCopyAccelerationStructureToMemoryInfoKHR-dst-parameter", - "text": " dst must be a valid VkDeviceOrHostAddressKHR union" - }, { "vuid": "VUID-VkCopyAccelerationStructureToMemoryInfoKHR-mode-parameter", "text": " mode must be a valid VkCopyAccelerationStructureModeKHR value" @@ -33066,10 +33030,6 @@ "vuid": "VUID-VkCopyMemoryToAccelerationStructureInfoKHR-pNext-pNext", "text": " pNext must be NULL" }, - { - "vuid": "VUID-VkCopyMemoryToAccelerationStructureInfoKHR-src-parameter", - "text": " src must be a valid VkDeviceOrHostAddressConstKHR union" - }, { "vuid": "VUID-VkCopyMemoryToAccelerationStructureInfoKHR-dst-parameter", "text": " dst must be a valid VkAccelerationStructureKHR handle" @@ -36848,19 +36808,7 @@ }, { "vuid": "VUID-StandaloneSpirv-OpControlBarrier-04650", - "text": " If the semantics for OpControlBarrier includes one of Acquire, Release, AcquireRelease, or SequentiallyConsistent memory semantics, then it must include at least one storage class #ifndef::VK_KHR_zero_initialize_workgroup_memory" - }, - { - "vuid": "VUID-StandaloneSpirv-OpVariable-04651", - "text": " Any OpVariable with an Initializer operand must have Output, Private, or Function as its Storage Class operand #endif::VK_KHR_zero_initialize_workgroup_memory #ifdef::VK_KHR_zero_initialize_workgroup_memory" - }, - { - "vuid": "VUID-StandaloneSpirv-OpVariable-04651", - "text": " Any OpVariable with an Initializer operand must have Output, Private, Function, or Workgroup as its Storage Class operand" - }, - { - "vuid": "VUID-StandaloneSpirv-OpVariable-04734", - "text": " Any OpVariable with an Initializer operand and Workgroup as its Storage Class operand must use OpConstantNull as the initializer. #endif::VK_KHR_zero_initialize_workgroup_memory" + "text": " If the semantics for OpControlBarrier includes one of Acquire, Release, AcquireRelease, or SequentiallyConsistent memory semantics, then it must include at least one storage class" }, { "vuid": "VUID-StandaloneSpirv-OpReadClockKHR-04652", @@ -36978,10 +36926,6 @@ "vuid": "VUID-StandaloneSpirv-OpTypeRuntimeArray-04680", "text": " OpTypeRuntimeArray must only be used for the last member of an OpTypeStruct that is in the StorageBuffer or PhysicalStorageBuffer storage class decorated as Block, or that is in the Uniform storage class decorated as BufferBlock" }, - { - "vuid": "VUID-StandaloneSpirv-Function-04681", - "text": " A type T that is an array sized with a specialization constant must neither be, nor be contained in, the type T2 of a variable V, unless:" - }, { "vuid": "VUID-StandaloneSpirv-OpControlBarrier-04682", "text": " If OpControlBarrier is used in ray generation, intersection, any-hit, closest hit, miss, fragment, vertex, tessellation evaluation, or geometry shaders, the execution Scope must be Subgroup" @@ -37098,6 +37042,34 @@ "vuid": "VUID-StandaloneSpirv-OpTypeForwardPointer-04711", "text": " OpTypeForwardPointer must have a storage class of PhysicalStorageBuffer" } + ], + "!(VK_KHR_zero_initialize_workgroup_memory)": [ + { + "vuid": "VUID-StandaloneSpirv-OpVariable-04651", + "text": " Any OpVariable with an Initializer operand must have Output, Private, or Function as its Storage Class operand" + } + ], + "(VK_KHR_zero_initialize_workgroup_memory)": [ + { + "vuid": "VUID-StandaloneSpirv-OpVariable-04651", + "text": " Any OpVariable with an Initializer operand must have Output, Private, Function, or Workgroup as its Storage Class operand" + }, + { + "vuid": "VUID-StandaloneSpirv-OpVariable-04734", + "text": " Any OpVariable with an Initializer operand and Workgroup as its Storage Class operand must use OpConstantNull as the initializer." + } + ], + "!(VK_KHR_workgroup_memory_explicit_layout)": [ + { + "vuid": "VUID-StandaloneSpirv-Function-04681", + "text": " A type T that is an array sized with a specialization constant must neither be, nor be contained in, the type T2 of a variable V, unless either: a) T is equal to T2, b) V is declared in the Function, Private, or Workgroup storage classes, or c) V is an interface variable with an additional level of arrayness, as described in interface matching, and T is the member type of the array type T2." + } + ], + "(VK_KHR_workgroup_memory_explicit_layout)": [ + { + "vuid": "VUID-StandaloneSpirv-Function-04681", + "text": " A type T that is an array sized with a specialization constant must neither be, nor be contained in, the type T2 of a variable V, unless either: a) T is equal to T2, b) V is declared in the Function, or Private storage classes, c) V is a non-Block variable in the Workgroup storage class, or d) V is an interface variable with an additional level of arrayness, as described in interface matching, and T is the member type of the array type T2." + } ] } } diff --git a/registry/vk.xml b/registry/vk.xml old mode 100755 new mode 100644 index fa31b42..21f02a1 --- a/registry/vk.xml +++ b/registry/vk.xml @@ -1,7 +1,7 @@ -Copyright (c) 2015-2020 The Khronos Group Inc. +Copyright 2015-2021 The Khronos Group Inc. SPDX-License-Identifier: Apache-2.0 OR MIT @@ -139,7 +139,7 @@ branch of the member gitlab server. // Vulkan 1.2 version number #define VK_API_VERSION_1_2 VK_MAKE_VERSION(1, 2, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 168 +#define VK_HEADER_VERSION 169 // Complete version of this file #define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) @@ -1332,7 +1332,7 @@ typedef void CAMetalLayer; VkFramebuffer framebuffer VkRect2D renderArea uint32_t clearValueCount - const VkClearValue* pClearValues + const VkClearValue* pClearValues float float32[4] @@ -1344,13 +1344,13 @@ typedef void CAMetalLayer; uint32_t stencil - VkClearColorValue color + VkClearColorValue color VkClearDepthStencilValue depthStencil VkImageAspectFlags aspectMask uint32_t colorAttachment - VkClearValue clearValue + VkClearValue clearValue VkAttachmentDescriptionFlags flags @@ -4335,7 +4335,7 @@ typedef void CAMetalLayer; VkPerformanceValueTypeINTEL type - VkPerformanceValueDataINTEL data + VkPerformanceValueDataINTEL data VkStructureType sType @@ -4454,7 +4454,7 @@ typedef void CAMetalLayer; char name[VK_MAX_DESCRIPTION_SIZE] char description[VK_MAX_DESCRIPTION_SIZE] VkPipelineExecutableStatisticFormatKHR format - VkPipelineExecutableStatisticValueKHR value + VkPipelineExecutableStatisticValueKHR value VkStructureType sType @@ -4706,7 +4706,7 @@ typedef void CAMetalLayer; VkStructureType sType const void* pNext - VkClearColorValue customBorderColor + VkClearColorValue customBorderColor VkFormat format @@ -4732,24 +4732,24 @@ typedef void CAMetalLayer; VkStructureType sType const void* pNext VkFormat vertexFormat - VkDeviceOrHostAddressConstKHR vertexData + VkDeviceOrHostAddressConstKHR vertexData VkDeviceSize vertexStride uint32_t maxVertex VkIndexType indexType - VkDeviceOrHostAddressConstKHR indexData - VkDeviceOrHostAddressConstKHR transformData + VkDeviceOrHostAddressConstKHR indexData + VkDeviceOrHostAddressConstKHR transformData VkStructureType sType const void* pNext - VkDeviceOrHostAddressConstKHR data + VkDeviceOrHostAddressConstKHR data VkDeviceSize stride VkStructureType sType const void* pNext VkBool32 arrayOfPointers - VkDeviceOrHostAddressConstKHR data + VkDeviceOrHostAddressConstKHR data VkAccelerationStructureGeometryTrianglesDataKHR triangles @@ -4774,7 +4774,7 @@ typedef void CAMetalLayer; uint32_t geometryCount const VkAccelerationStructureGeometryKHR* pGeometries const VkAccelerationStructureGeometryKHR* const* ppGeometries - VkDeviceOrHostAddressKHR scratchData + VkDeviceOrHostAddressKHR scratchData uint32_t primitiveCount @@ -4836,13 +4836,13 @@ typedef void CAMetalLayer; VkStructureType sType const void* pNext VkAccelerationStructureKHR src - VkDeviceOrHostAddressKHR dst + VkDeviceOrHostAddressKHR dst VkCopyAccelerationStructureModeKHR mode VkStructureType sType const void* pNext - VkDeviceOrHostAddressConstKHR src + VkDeviceOrHostAddressConstKHR src VkAccelerationStructureKHR dst VkCopyAccelerationStructureModeKHR mode @@ -4911,8 +4911,8 @@ typedef void CAMetalLayer; VkStructureType sType void* pNext VkBool32 robustImageAccess - - + + VkStructureType sType void* pNext VkBool32 workgroupMemoryExplicitLayout @@ -7387,7 +7387,7 @@ typedef void CAMetalLayer; VkCommandBuffer commandBuffer VkImage image VkImageLayout imageLayout - const VkClearColorValue* pColor + const VkClearColorValue* pColor uint32_t rangeCount const VkImageSubresourceRange* pRanges @@ -14298,8 +14298,8 @@ typedef void CAMetalLayer; - - + + @@ -14323,7 +14323,7 @@ typedef void CAMetalLayer; - + @@ -14839,8 +14839,8 @@ typedef void CAMetalLayer; - - + + @@ -15228,10 +15228,10 @@ typedef void CAMetalLayer; - + - + diff --git a/registry/vkconventions.py b/registry/vkconventions.py index e12e0ff..5ceeeb0 100644 --- a/registry/vkconventions.py +++ b/registry/vkconventions.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -i # -# Copyright (c) 2013-2020 The Khronos Group Inc. +# Copyright 2013-2021 The Khronos Group Inc. # # SPDX-License-Identifier: Apache-2.0 -- cgit v1.2.3