Skip to content

Commit

Permalink
Merge pull request #363 from ThreeOfTwelve/vulkan-update-v1.3.205
Browse files Browse the repository at this point in the history
  • Loading branch information
expipiplus1 authored Feb 5, 2022
2 parents 2ba4a95 + 00c3239 commit be153cc
Show file tree
Hide file tree
Showing 37 changed files with 365 additions and 229 deletions.
3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## WIP

## [3.16.1] - 2022-02-05
- Bump API version to v1.3.205

## [3.16] - 2022-02-05
- Bump API version to v1.3.204

Expand Down
2 changes: 1 addition & 1 deletion package.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: vulkan
version: "3.16"
version: "3.16.1"
synopsis: Bindings to the Vulkan graphics API.
description: Please see [the readme](https://github.com/expipiplus1/vulkan/#readme)
category: Graphics
Expand Down
126 changes: 92 additions & 34 deletions src/Vulkan/Core10/CommandBufferBuilding.hs
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ foreign import ccall
-- 'Vulkan.Core10.Enums.DynamicState.DYNAMIC_STATE_DEPTH_BIAS' set in
-- 'Vulkan.Core10.Pipeline.PipelineDynamicStateCreateInfo'::@pDynamicStates@.
-- Otherwise, this state is specified by the corresponding
-- 'Vulkan.Core10.Pipeline.PipelineInputAssemblyStateCreateInfo'::@depthBiasConstantFactor@,
-- 'Vulkan.Core10.Pipeline.PipelineRasterizationStateCreateInfo'::@depthBiasConstantFactor@,
-- @depthBiasClamp@, and @depthBiasSlopeFactor@ values used to create the
-- currently active pipeline.
--
Expand Down Expand Up @@ -1330,9 +1330,9 @@ foreign import ccall
--
-- = Description
--
-- 'cmdBindDescriptorSets' causes the sets numbered [@firstSet@..
-- @firstSet@+@descriptorSetCount@-1] to use the bindings stored in
-- @pDescriptorSets@[0..descriptorSetCount-1] for subsequent
-- 'cmdBindDescriptorSets' binds descriptor sets
-- @pDescriptorSets@[0..@descriptorSetCount@-1] to set numbers
-- [@firstSet@..@firstSet@+@descriptorSetCount@-1] for subsequent
-- <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#pipeline-bindpoint-commands bound pipeline commands>
-- set by @pipelineBindPoint@. Any bindings that were previously applied
-- via these sets are no longer valid.
Expand Down Expand Up @@ -2072,12 +2072,19 @@ foreign import ccall
-- - #VUID-vkCmdDraw-None-02686# Every input attachment used by the
-- current subpass /must/ be bound to the pipeline via a descriptor set
--
-- - #VUID-vkCmdDraw-None-04584# Image subresources used as attachments
-- in the current render pass /must/ not be accessed in any way other
-- than as an attachment by this command, except for cases involving
-- read-only access to depth\/stencil attachments as described in the
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#renderpass-attachment-nonattachment Render Pass>
-- chapter
-- - #VUID-vkCmdDraw-None-06537# Memory backing image subresources used
-- as attachments in the current render pass /must/ not be written in
-- any way other than as an attachment by this command
--
-- - #VUID-vkCmdDraw-None-06538# If any recorded command in the current
-- subpass will write to an image subresource as an attachment, this
-- command /must/ not read from the memory backing that image
-- subresource in any other way than as an attachment
--
-- - #VUID-vkCmdDraw-None-06539# If any recorded command in the current
-- subpass will read from an image subresource used as an attachment in
-- any way other than as an attachment, this command /must/ not write
-- to that image subresource as an attachment
--
-- - #VUID-vkCmdDraw-maxMultiviewInstanceIndex-02688# If the draw is
-- recorded in a render pass instance with multiview enabled, the
Expand Down Expand Up @@ -2973,13 +2980,19 @@ foreign import ccall
-- the current subpass /must/ be bound to the pipeline via a descriptor
-- set
--
-- - #VUID-vkCmdDrawIndexed-None-04584# Image subresources used as
-- attachments in the current render pass /must/ not be accessed in any
-- way other than as an attachment by this command, except for cases
-- involving read-only access to depth\/stencil attachments as
-- described in the
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#renderpass-attachment-nonattachment Render Pass>
-- chapter
-- - #VUID-vkCmdDrawIndexed-None-06537# Memory backing image subresources
-- used as attachments in the current render pass /must/ not be written
-- in any way other than as an attachment by this command
--
-- - #VUID-vkCmdDrawIndexed-None-06538# If any recorded command in the
-- current subpass will write to an image subresource as an attachment,
-- this command /must/ not read from the memory backing that image
-- subresource in any other way than as an attachment
--
-- - #VUID-vkCmdDrawIndexed-None-06539# If any recorded command in the
-- current subpass will read from an image subresource used as an
-- attachment in any way other than as an attachment, this command
-- /must/ not write to that image subresource as an attachment
--
-- - #VUID-vkCmdDrawIndexed-maxMultiviewInstanceIndex-02688# If the draw
-- is recorded in a render pass instance with multiview enabled, the
Expand Down Expand Up @@ -3869,13 +3882,20 @@ foreign import ccall
-- the current subpass /must/ be bound to the pipeline via a descriptor
-- set
--
-- - #VUID-vkCmdDrawIndirect-None-04584# Image subresources used as
-- attachments in the current render pass /must/ not be accessed in any
-- way other than as an attachment by this command, except for cases
-- involving read-only access to depth\/stencil attachments as
-- described in the
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#renderpass-attachment-nonattachment Render Pass>
-- chapter
-- - #VUID-vkCmdDrawIndirect-None-06537# Memory backing image
-- subresources used as attachments in the current render pass /must/
-- not be written in any way other than as an attachment by this
-- command
--
-- - #VUID-vkCmdDrawIndirect-None-06538# If any recorded command in the
-- current subpass will write to an image subresource as an attachment,
-- this command /must/ not read from the memory backing that image
-- subresource in any other way than as an attachment
--
-- - #VUID-vkCmdDrawIndirect-None-06539# If any recorded command in the
-- current subpass will read from an image subresource used as an
-- attachment in any way other than as an attachment, this command
-- /must/ not write to that image subresource as an attachment
--
-- - #VUID-vkCmdDrawIndirect-maxMultiviewInstanceIndex-02688# If the draw
-- is recorded in a render pass instance with multiview enabled, the
Expand Down Expand Up @@ -4788,13 +4808,20 @@ foreign import ccall
-- used by the current subpass /must/ be bound to the pipeline via a
-- descriptor set
--
-- - #VUID-vkCmdDrawIndexedIndirect-None-04584# Image subresources used
-- as attachments in the current render pass /must/ not be accessed in
-- any way other than as an attachment by this command, except for
-- cases involving read-only access to depth\/stencil attachments as
-- described in the
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#renderpass-attachment-nonattachment Render Pass>
-- chapter
-- - #VUID-vkCmdDrawIndexedIndirect-None-06537# Memory backing image
-- subresources used as attachments in the current render pass /must/
-- not be written in any way other than as an attachment by this
-- command
--
-- - #VUID-vkCmdDrawIndexedIndirect-None-06538# If any recorded command
-- in the current subpass will write to an image subresource as an
-- attachment, this command /must/ not read from the memory backing
-- that image subresource in any other way than as an attachment
--
-- - #VUID-vkCmdDrawIndexedIndirect-None-06539# If any recorded command
-- in the current subpass will read from an image subresource used as
-- an attachment in any way other than as an attachment, this command
-- /must/ not write to that image subresource as an attachment
--
-- - #VUID-vkCmdDrawIndexedIndirect-maxMultiviewInstanceIndex-02688# If
-- the draw is recorded in a render pass instance with multiview
Expand Down Expand Up @@ -8006,7 +8033,7 @@ foreign import ccall
-- when the command is called.
--
-- 'cmdUpdateBuffer' is only allowed outside of a render pass. This command
-- is treated as “transfer” operation, for the purposes of synchronization
-- is treated as a “transfer” operation for the purposes of synchronization
-- barriers. The
-- 'Vulkan.Core10.Enums.BufferUsageFlagBits.BUFFER_USAGE_TRANSFER_DST_BIT'
-- /must/ be specified in @usage@ of
Expand Down Expand Up @@ -8140,7 +8167,7 @@ foreign import ccall
--
-- = Description
--
-- 'cmdFillBuffer' is treated as “transfer” operation for the purposes of
-- 'cmdFillBuffer' is treated as a “transfer” operation for the purposes of
-- synchronization barriers. The
-- 'Vulkan.Core10.Enums.BufferUsageFlagBits.BUFFER_USAGE_TRANSFER_DST_BIT'
-- /must/ be specified in @usage@ of
Expand Down Expand Up @@ -10893,7 +10920,7 @@ foreign import ccall
-- - #VUID-vkCmdWriteTimestamp-synchronization2-06489# If the
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#features-synchronization2 synchronization2>
-- feature is not enabled, @pipelineStage@ /must/ not be
-- 'Vulkan.Extensions.VK_KHR_synchronization2.PIPELINE_STAGE_NONE_KHR'
-- 'Vulkan.Core10.Enums.PipelineStageFlagBits.PIPELINE_STAGE_NONE'
--
-- - #VUID-vkCmdWriteTimestamp-queryPool-01416# @queryPool@ /must/ have
-- been created with a @queryType@ of
Expand Down Expand Up @@ -11960,6 +11987,37 @@ foreign import ccall
-- - #VUID-vkCmdExecuteCommands-None-02286# This command /must/ not be
-- recorded when transform feedback is active
--
-- - #VUID-vkCmdExecuteCommands-commandBuffer-06533# If
-- 'cmdExecuteCommands' is being called within a render pass instance
-- and any recorded command in @commandBuffer@ in the current subpass
-- will write to an image subresource as an attachment, commands
-- recorded in elements of @pCommandBuffers@ /must/ not read from the
-- memory backing that image subresource in any other way
--
-- - #VUID-vkCmdExecuteCommands-commandBuffer-06534# If
-- 'cmdExecuteCommands' is being called within a render pass instance
-- and any recorded command in @commandBuffer@ in the current subpass
-- will read from an image subresource used as an attachment in any way
-- other than as an attachment, commands recorded in elements of
-- @pCommandBuffers@ /must/ not write to that image subresource as an
-- attachment
--
-- - #VUID-vkCmdExecuteCommands-pCommandBuffers-06535# If
-- 'cmdExecuteCommands' is being called within a render pass instance
-- and any recorded command in a given element of @pCommandBuffers@
-- will write to an image subresource as an attachment, commands
-- recorded in elements of @pCommandBuffers@ at a higher index /must/
-- not read from the memory backing that image subresource in any other
-- way
--
-- - #VUID-vkCmdExecuteCommands-pCommandBuffers-06536# If
-- 'cmdExecuteCommands' is being called within a render pass instance
-- and any recorded command in a given element of @pCommandBuffers@
-- will read from an image subresource used as an attachment in any way
-- other than as an attachment, commands recorded in elements of
-- @pCommandBuffers@ at a higher index /must/ not write to that image
-- subresource as an attachment
--
-- - #VUID-vkCmdExecuteCommands-pCommandBuffers-06021# If
-- @pCommandBuffers@ contains any
-- <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#renderpass-suspension suspended render pass instances>,
Expand Down
10 changes: 5 additions & 5 deletions src/Vulkan/Core10/Enums/ImageAspectFlagBits.hs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ module Vulkan.Core10.Enums.ImageAspectFlagBits ( ImageAspectFlags
, IMAGE_ASPECT_DEPTH_BIT
, IMAGE_ASPECT_STENCIL_BIT
, IMAGE_ASPECT_METADATA_BIT
, IMAGE_ASPECT_NONE_KHR
, IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT
, IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT
, IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT
, IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT
, IMAGE_ASPECT_NONE
, IMAGE_ASPECT_PLANE_2_BIT
, IMAGE_ASPECT_PLANE_1_BIT
, IMAGE_ASPECT_PLANE_0_BIT
Expand Down Expand Up @@ -53,9 +53,6 @@ pattern IMAGE_ASPECT_STENCIL_BIT = ImageAspectFlagBits 0x00000004
-- <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#sparsememory sparse resource>
-- operations.
pattern IMAGE_ASPECT_METADATA_BIT = ImageAspectFlagBits 0x00000008
-- | 'IMAGE_ASPECT_NONE_KHR' specifies no image aspect, or the image aspect
-- is not applicable.
pattern IMAGE_ASPECT_NONE_KHR = ImageAspectFlagBits 0x00000000
-- | 'IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT' specifies /memory plane/ 3.
pattern IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT = ImageAspectFlagBits 0x00000400
-- | 'IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT' specifies /memory plane/ 2.
Expand All @@ -64,6 +61,9 @@ pattern IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT = ImageAspectFlagBits 0x00000200
pattern IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT = ImageAspectFlagBits 0x00000100
-- | 'IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT' specifies /memory plane/ 0.
pattern IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT = ImageAspectFlagBits 0x00000080
-- | 'IMAGE_ASPECT_NONE' specifies no image aspect, or the image aspect is
-- not applicable.
pattern IMAGE_ASPECT_NONE = ImageAspectFlagBits 0x00000000
-- | 'IMAGE_ASPECT_PLANE_2_BIT' specifies plane 2 of a /multi-planar/ image
-- format.
pattern IMAGE_ASPECT_PLANE_2_BIT = ImageAspectFlagBits 0x00000040
Expand All @@ -86,11 +86,11 @@ showTableImageAspectFlagBits =
, (IMAGE_ASPECT_DEPTH_BIT , "DEPTH_BIT")
, (IMAGE_ASPECT_STENCIL_BIT , "STENCIL_BIT")
, (IMAGE_ASPECT_METADATA_BIT , "METADATA_BIT")
, (IMAGE_ASPECT_NONE_KHR , "NONE_KHR")
, (IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT, "MEMORY_PLANE_3_BIT_EXT")
, (IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT, "MEMORY_PLANE_2_BIT_EXT")
, (IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT, "MEMORY_PLANE_1_BIT_EXT")
, (IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT, "MEMORY_PLANE_0_BIT_EXT")
, (IMAGE_ASPECT_NONE , "NONE")
, (IMAGE_ASPECT_PLANE_2_BIT , "PLANE_2_BIT")
, (IMAGE_ASPECT_PLANE_1_BIT , "PLANE_1_BIT")
, (IMAGE_ASPECT_PLANE_0_BIT , "PLANE_0_BIT")
Expand Down
2 changes: 1 addition & 1 deletion src/Vulkan/Core10/Enums/StructureType.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,7 @@ import GHC.Show (Show(showsPrec))
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#VkVideoEncodeH265CapabilitiesEXT VkVideoEncodeH265CapabilitiesEXT>,
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#VkVideoEncodeH265DpbSlotInfoEXT VkVideoEncodeH265DpbSlotInfoEXT>,
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#VkVideoEncodeH265EmitPictureParametersEXT VkVideoEncodeH265EmitPictureParametersEXT>,
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#VkVideoEncodeH265NaluSliceEXT VkVideoEncodeH265NaluSliceEXT>,
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#VkVideoEncodeH265NaluSliceSegmentEXT VkVideoEncodeH265NaluSliceSegmentEXT>,
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#VkVideoEncodeH265ProfileEXT VkVideoEncodeH265ProfileEXT>,
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#VkVideoEncodeH265RateControlInfoEXT VkVideoEncodeH265RateControlInfoEXT>,
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#VkVideoEncodeH265RateControlLayerInfoEXT VkVideoEncodeH265RateControlLayerInfoEXT>,
Expand Down
2 changes: 1 addition & 1 deletion src/Vulkan/Core10/Image.hs
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ getImageSubresourceLayout device image subresource = liftIO . evalContT $ do
-- equal to 'ImageCreateInfo'::@format@ and with
-- 'Vulkan.Extensions.VK_EXT_image_drm_format_modifier.DrmFormatModifierPropertiesListEXT'
-- chained into
-- 'Vulkan.Core11.Promoted_From_VK_KHR_get_physical_device_properties2.ImageFormatProperties2';
-- 'Vulkan.Core11.Promoted_From_VK_KHR_get_physical_device_properties2.FormatProperties2';
-- by collecting all members of the returned array
-- 'Vulkan.Extensions.VK_EXT_image_drm_format_modifier.DrmFormatModifierPropertiesListEXT'::@pDrmFormatModifierProperties@
-- whose @drmFormatModifier@ belongs to
Expand Down
3 changes: 2 additions & 1 deletion src/Vulkan/Core10/ImageView.hs
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,8 @@ instance Zero ImageSubresourceRange where
-- 'Vulkan.Core10.Enums.ImageType.IMAGE_TYPE_3D' and @viewType@ is
-- 'Vulkan.Core10.Enums.ImageViewType.IMAGE_VIEW_TYPE_2D' or
-- 'Vulkan.Core10.Enums.ImageViewType.IMAGE_VIEW_TYPE_2D_ARRAY' then
-- @flags@ /must/ not contain any of
-- 'Vulkan.Core10.Image.ImageCreateInfo'::@flags@ /must/ not contain
-- any of
-- 'Vulkan.Core10.Enums.ImageCreateFlagBits.IMAGE_CREATE_SPARSE_BINDING_BIT',
-- 'Vulkan.Core10.Enums.ImageCreateFlagBits.IMAGE_CREATE_SPARSE_RESIDENCY_BIT',
-- and
Expand Down
Loading

0 comments on commit be153cc

Please sign in to comment.