diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,9 @@ ## WIP +## [3.22.1] - 2022-09-25 +- Bump API version to v1.3.229 + ## [3.22] - 2022-09-24 - Bump API version to v1.3.228 diff --git a/package.yaml b/package.yaml --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: vulkan -version: "3.22" +version: "3.22.1" synopsis: Bindings to the Vulkan graphics API. description: Please see [the readme](https://github.com/expipiplus1/vulkan/#readme) category: Graphics diff --git a/src/Vulkan/Core10/Enums/StructureType.hs b/src/Vulkan/Core10/Enums/StructureType.hs --- a/src/Vulkan/Core10/Enums/StructureType.hs +++ b/src/Vulkan/Core10/Enums/StructureType.hs @@ -1271,7 +1271,6 @@ -- , -- , -- , --- , -- , -- , -- , diff --git a/src/Vulkan/Core10/ImageView.hs b/src/Vulkan/Core10/ImageView.hs --- a/src/Vulkan/Core10/ImageView.hs +++ b/src/Vulkan/Core10/ImageView.hs @@ -583,12 +583,12 @@ -- If @image@ was created with the -- 'Vulkan.Core10.Enums.ImageCreateFlagBits.IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT' -- flag, @format@ /must/ be /compatible/ with the image’s format as --- described above, or /must/ be an uncompressed format in which case it --- /must/ be /size-compatible/ with the image’s format, as defined for --- . --- In this case, the resulting image view’s texel dimensions equal the --- dimensions of the selected mip level divided by the compressed texel --- block size and rounded up. +-- described above; or /must/ be an uncompressed format, in which case it +-- /must/ be +-- +-- with the image’s format. In this case, the resulting image view’s texel +-- dimensions equal the dimensions of the selected mip level divided by the +-- compressed texel block size and rounded up. -- -- The 'ComponentMapping' @components@ member describes a remapping from -- components of the image to components of the vector returned by shader diff --git a/src/Vulkan/Core10/Pipeline.hs b/src/Vulkan/Core10/Pipeline.hs --- a/src/Vulkan/Core10/Pipeline.hs +++ b/src/Vulkan/Core10/Pipeline.hs @@ -1124,38 +1124,6 @@ -- invocations /must/ either discard the fragment, or write or -- initialize the value of @FragStencilRefEXT@ -- --- - #VUID-VkPipelineShaderStageCreateInfo-stage-02093# If @stage@ is --- 'Vulkan.Extensions.VK_NV_mesh_shader.SHADER_STAGE_MESH_BIT_NV' and --- the @MeshNV@ @Execution@ @Model@ is used, the identified entry point --- /must/ have an @OpExecutionMode@ instruction specifying a maximum --- output vertex count, @OutputVertices@, that is greater than @0@ and --- less than or equal to --- 'Vulkan.Extensions.VK_NV_mesh_shader.PhysicalDeviceMeshShaderPropertiesNV'::@maxMeshOutputVertices@ --- --- - #VUID-VkPipelineShaderStageCreateInfo-stage-02094# If @stage@ is --- 'Vulkan.Extensions.VK_NV_mesh_shader.SHADER_STAGE_MESH_BIT_NV' and --- the @MeshNV@ @Execution@ @Model@ is used, the identified entry point --- /must/ have an @OpExecutionMode@ instruction specifying a maximum --- output primitive count, @OutputPrimitivesNV@, that is greater than --- @0@ and less than or equal to --- 'Vulkan.Extensions.VK_NV_mesh_shader.PhysicalDeviceMeshShaderPropertiesNV'::@maxMeshOutputPrimitives@ --- --- - #VUID-VkPipelineShaderStageCreateInfo-stage-07061# If @stage@ is --- 'Vulkan.Core10.Enums.ShaderStageFlagBits.SHADER_STAGE_MESH_BIT_EXT' --- and the @MeshEXT@ @Execution@ @Model@ is used, the identified entry --- point /must/ have an @OpExecutionMode@ instruction specifying a --- maximum output vertex count, @OutputVertices@, that is greater than --- @0@ and less than or equal to --- 'Vulkan.Extensions.VK_EXT_mesh_shader.PhysicalDeviceMeshShaderPropertiesEXT'::@maxMeshOutputVertices@ --- --- - #VUID-VkPipelineShaderStageCreateInfo-stage-07062# If @stage@ is --- 'Vulkan.Core10.Enums.ShaderStageFlagBits.SHADER_STAGE_MESH_BIT_EXT' --- and the @MeshEXT@ @Execution@ @Model@ is used, the identified entry --- point /must/ have an @OpExecutionMode@ instruction specifying a --- maximum output primitive count, @OutputPrimitivesEXT@, that is --- greater than @0@ and less than or equal to --- 'Vulkan.Extensions.VK_EXT_mesh_shader.PhysicalDeviceMeshShaderPropertiesEXT'::@maxMeshOutputPrimitives@ --- -- - #VUID-VkPipelineShaderStageCreateInfo-flags-02784# If @flags@ has -- the -- 'Vulkan.Core10.Enums.PipelineShaderStageCreateFlagBits.PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT' @@ -3715,7 +3683,7 @@ -- state values /must/ not modify whether state in a linked library is -- static or dynamic; this is set and unchangeable when the library is -- created. For example, if a pipeline only included --- , +-- , -- then any dynamic state value corresponding to depth or stencil testing -- has no effect. -- diff --git a/src/Vulkan/Core10/Query.hs b/src/Vulkan/Core10/Query.hs --- a/src/Vulkan/Core10/Query.hs +++ b/src/Vulkan/Core10/Query.hs @@ -581,8 +581,10 @@ -- 'Vulkan.Extensions.VK_INTEL_performance_query.QueryPoolPerformanceQueryCreateInfoINTEL', -- , -- , +-- , -- , -- , +-- , -- or -- -- diff --git a/src/Vulkan/Extensions/VK_EXT_mesh_shader.hs b/src/Vulkan/Extensions/VK_EXT_mesh_shader.hs --- a/src/Vulkan/Extensions/VK_EXT_mesh_shader.hs +++ b/src/Vulkan/Extensions/VK_EXT_mesh_shader.hs @@ -1233,28 +1233,69 @@ -- -- must not be active -- --- - #VUID-vkCmdDrawMeshTasksEXT-groupCountX-07083# @groupCountX@ /must/ --- be less than or equal to +-- - #VUID-vkCmdDrawMeshTasksEXT-TaskEXT-07322# If the current pipeline +-- bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- contains a shader using the @TaskEXT@ @Execution@ @Model@, +-- @groupCountX@ /must/ be less than or equal to -- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxTaskWorkGroupCount@[0] -- --- - #VUID-vkCmdDrawMeshTasksEXT-groupCountY-07084# @groupCountY@ /must/ --- be less than or equal to +-- - #VUID-vkCmdDrawMeshTasksEXT-TaskEXT-07323# If the current pipeline +-- bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- contains a shader using the @TaskEXT@ @Execution@ @Model@, +-- @groupCountY@ /must/ be less than or equal to -- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxTaskWorkGroupCount@[1] -- --- - #VUID-vkCmdDrawMeshTasksEXT-groupCountZ-07085# @groupCountZ@ /must/ --- be less than or equal to +-- - #VUID-vkCmdDrawMeshTasksEXT-TaskEXT-07324# If the current pipeline +-- bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- contains a shader using the @TaskEXT@ @Execution@ @Model@, +-- @groupCountZ@ /must/ be less than or equal to -- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxTaskWorkGroupCount@[2] -- --- - #VUID-vkCmdDrawMeshTasksEXT-groupCountX-07086# The product of --- @groupCountX@, @groupCountY@ and @groupCountZ@ /must/ be less than --- or equal to +-- - #VUID-vkCmdDrawMeshTasksEXT-TaskEXT-07325# If the current pipeline +-- bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- contains a shader using the @TaskEXT@ @Execution@ @Model@, The +-- product of @groupCountX@, @groupCountY@ and @groupCountZ@ /must/ be +-- less than or equal to -- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxTaskWorkGroupTotalCount@ -- +-- - #VUID-vkCmdDrawMeshTasksEXT-TaskEXT-07326# If the current pipeline +-- bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- does not contain a shader using the @TaskEXT@ @Execution@ @Model@, +-- @groupCountX@ /must/ be less than or equal to +-- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxMeshWorkGroupCount@[0] +-- +-- - #VUID-vkCmdDrawMeshTasksEXT-TaskEXT-07327# If the current pipeline +-- bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- does not contain a shader using the @TaskEXT@ @Execution@ @Model@, +-- @groupCountY@ /must/ be less than or equal to +-- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxMeshWorkGroupCount@[1] +-- +-- - #VUID-vkCmdDrawMeshTasksEXT-TaskEXT-07328# If the current pipeline +-- bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- does not contain a shader using the @TaskEXT@ @Execution@ @Model@, +-- @groupCountZ@ /must/ be less than or equal to +-- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxMeshWorkGroupCount@[2] +-- +-- - #VUID-vkCmdDrawMeshTasksEXT-TaskEXT-07329# If the current pipeline +-- bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- does not contain a shader using the @TaskEXT@ @Execution@ @Model@, +-- The product of @groupCountX@, @groupCountY@ and @groupCountZ@ /must/ +-- be less than or equal to +-- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxMeshWorkGroupTotalCount@ +-- -- - #VUID-vkCmdDrawMeshTasksEXT-MeshEXT-07087# The current pipeline -- bound to -- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' -- /must/ contain a shader stage using the @MeshEXT@ @Execution@ --- @Model@. +-- @Model@ -- -- == Valid Usage (Implicit) -- @@ -2288,7 +2329,7 @@ -- pipeline bound to -- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' -- /must/ contain a shader stage using the @MeshEXT@ @Execution@ --- @Model@. +-- @Model@ -- -- == Valid Usage (Implicit) -- @@ -3351,7 +3392,7 @@ -- pipeline bound to -- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' -- /must/ contain a shader stage using the @MeshEXT@ @Execution@ --- @Model@. +-- @Model@ -- -- == Valid Usage (Implicit) -- @@ -3962,22 +4003,55 @@ -- -- == Valid Usage -- --- - #VUID-VkDrawMeshTasksIndirectCommandEXT-groupCountX-07092# +-- - [[VUID-{refpage}-TaskEXT-07322]] If the current pipeline bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- contains a shader using the @TaskEXT@ @Execution@ @Model@, -- @groupCountX@ /must/ be less than or equal to -- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxTaskWorkGroupCount@[0] -- --- - #VUID-VkDrawMeshTasksIndirectCommandEXT-groupCountY-07093# +-- - [[VUID-{refpage}-TaskEXT-07323]] If the current pipeline bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- contains a shader using the @TaskEXT@ @Execution@ @Model@, -- @groupCountY@ /must/ be less than or equal to -- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxTaskWorkGroupCount@[1] -- --- - #VUID-VkDrawMeshTasksIndirectCommandEXT-groupCountZ-07094# +-- - [[VUID-{refpage}-TaskEXT-07324]] If the current pipeline bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- contains a shader using the @TaskEXT@ @Execution@ @Model@, -- @groupCountZ@ /must/ be less than or equal to -- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxTaskWorkGroupCount@[2] -- --- - #VUID-VkDrawMeshTasksIndirectCommandEXT-groupCountX-07095# The +-- - [[VUID-{refpage}-TaskEXT-07325]] If the current pipeline bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- contains a shader using the @TaskEXT@ @Execution@ @Model@, The -- product of @groupCountX@, @groupCountY@ and @groupCountZ@ /must/ be -- less than or equal to -- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxTaskWorkGroupTotalCount@ +-- +-- - [[VUID-{refpage}-TaskEXT-07326]] If the current pipeline bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- does not contain a shader using the @TaskEXT@ @Execution@ @Model@, +-- @groupCountX@ /must/ be less than or equal to +-- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxMeshWorkGroupCount@[0] +-- +-- - [[VUID-{refpage}-TaskEXT-07327]] If the current pipeline bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- does not contain a shader using the @TaskEXT@ @Execution@ @Model@, +-- @groupCountY@ /must/ be less than or equal to +-- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxMeshWorkGroupCount@[1] +-- +-- - [[VUID-{refpage}-TaskEXT-07328]] If the current pipeline bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- does not contain a shader using the @TaskEXT@ @Execution@ @Model@, +-- @groupCountZ@ /must/ be less than or equal to +-- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxMeshWorkGroupCount@[2] +-- +-- - [[VUID-{refpage}-TaskEXT-07329]] If the current pipeline bound to +-- 'Vulkan.Core10.Enums.PipelineBindPoint.PIPELINE_BIND_POINT_GRAPHICS' +-- does not contain a shader using the @TaskEXT@ @Execution@ @Model@, +-- The product of @groupCountX@, @groupCountY@ and @groupCountZ@ /must/ +-- be less than or equal to +-- 'PhysicalDeviceMeshShaderPropertiesEXT'::@maxMeshWorkGroupTotalCount@ -- -- = See Also -- diff --git a/src/Vulkan/Extensions/VK_EXT_transform_feedback.hs b/src/Vulkan/Extensions/VK_EXT_transform_feedback.hs --- a/src/Vulkan/Extensions/VK_EXT_transform_feedback.hs +++ b/src/Vulkan/Extensions/VK_EXT_transform_feedback.hs @@ -1072,7 +1072,8 @@ -- -- - #VUID-vkCmdBeginQueryIndexedEXT-commandBuffer-cmdpool# The -- 'Vulkan.Core10.Handles.CommandPool' that @commandBuffer@ was --- allocated from /must/ support graphics, or compute operations +-- allocated from /must/ support graphics, compute, decode, or encode +-- operations -- -- - #VUID-vkCmdBeginQueryIndexedEXT-videocoding# This command /must/ -- only be called outside of a video coding scope @@ -1097,6 +1098,8 @@ -- +============================================================================================================================+========================================================================================================================+=============================================================================================================================+=======================================================================================================================+========================================================================================================================================+ -- | Primary | Both | Outside | Graphics | Action | -- | Secondary | | | Compute | State | +-- | | | | Decode | | +-- | | | | Encode | | -- +----------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------+ -- -- = See Also @@ -1242,7 +1245,8 @@ -- -- - #VUID-vkCmdEndQueryIndexedEXT-commandBuffer-cmdpool# The -- 'Vulkan.Core10.Handles.CommandPool' that @commandBuffer@ was --- allocated from /must/ support graphics, or compute operations +-- allocated from /must/ support graphics, compute, decode, or encode +-- operations -- -- - #VUID-vkCmdEndQueryIndexedEXT-videocoding# This command /must/ only -- be called outside of a video coding scope @@ -1267,6 +1271,8 @@ -- +============================================================================================================================+========================================================================================================================+=============================================================================================================================+=======================================================================================================================+========================================================================================================================================+ -- | Primary | Both | Outside | Graphics | Action | -- | Secondary | | | Compute | State | +-- | | | | Decode | | +-- | | | | Encode | | -- +----------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------+ -- -- = See Also diff --git a/src/Vulkan/Version.hs b/src/Vulkan/Version.hs --- a/src/Vulkan/Version.hs +++ b/src/Vulkan/Version.hs @@ -19,11 +19,11 @@ import Data.Word (Word32) pattern HEADER_VERSION :: Word32 -pattern HEADER_VERSION = 228 +pattern HEADER_VERSION = 229 pattern HEADER_VERSION_COMPLETE :: Word32 -pattern HEADER_VERSION_COMPLETE = MAKE_API_VERSION 1 3 228 +pattern HEADER_VERSION_COMPLETE = MAKE_API_VERSION 1 3 229 pattern MAKE_API_VERSION :: Word32 -> Word32 -> Word32 -> Word32 diff --git a/vulkan.cabal b/vulkan.cabal --- a/vulkan.cabal +++ b/vulkan.cabal @@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack name: vulkan -version: 3.22 +version: 3.22.1 synopsis: Bindings to the Vulkan graphics API. description: Please see [the readme](https://github.com/expipiplus1/vulkan/#readme) category: Graphics