Skip to content

Commit 1123da3

Browse files
authored
Merge pull request #311 from expipiplus1/joe-183
Bump vulkan version to v1.2.183
2 parents 4387948 + 49de7cf commit 1123da3

37 files changed

+277
-129
lines changed

changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## WIP
44

5+
## [3.11.1] - 2021-06-28
6+
- Bump API version to v1.2.183
7+
58
## [3.11.0.2] - 2021-06-26
69
- Tweak cabal file to please `cabal check`
710

generate-new/src/Bespoke.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,8 +1176,8 @@ cuLaunchSchemes :: BespokeScheme
11761176
cuLaunchSchemes =
11771177
BespokeScheme $ \case
11781178
"VkCuLaunchInfoNVX" -> \case
1179-
a | "pParams" <- name a -> Just (Preserve (type' a))
1180-
a | "pExtras" <- name a -> Just (Preserve (type' a))
1179+
a | "pParams" <- name a -> Just (Vector NotNullable VoidPtr)
1180+
a | "pExtras" <- name a -> Just (Vector NotNullable VoidPtr)
11811181
_ -> Nothing
11821182
_ -> const Nothing
11831183

generate-new/src/Render/Stmts/Poke.hs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,10 @@ lenRefFromSibling name = do
496496
("either id (fromIntegral . Data.Vector.length)" <+> vec)
497497
-- Assume vector for now, TODO, put this in CustomScheme
498498
Custom _ -> pure $ Pure InlineOnce ("Data.Vector.length $" <+> vec)
499-
_ -> throw "Trying to get the length of a non vector type sibling"
499+
s ->
500+
throw
501+
$ "Trying to get the length of a non vector type sibling: "
502+
<> show s
500503

501504

502505
-- TODO: the type of the value here could be improved

generate-new/src/Spec/Parse.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,8 +1056,6 @@ parseSPIRVThings thingType mkThing es = V.fromList <$> sequenceV
10561056
[ parseExtension e
10571057
| Element e <- es
10581058
, thingType == name e
1059-
-- https://github.com/KhronosGroup/Vulkan-Docs/issues/1565
1060-
, getAttr "name" e /= Just "RayTracingMotionBlurNV"
10611059
]
10621060
where
10631061
parseExtension n = do

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: vulkan
2-
version: "3.11.0.2"
2+
version: "3.11.1"
33
synopsis: Bindings to the Vulkan graphics API.
44
description: Please see [the readme](https://github.com/expipiplus1/vulkan/#readme)
55
category: Graphics

src/Vulkan/CStruct/Extends.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,7 @@ type family Extends (a :: [Type] -> Type) (b :: Type) :: Constraint where
828828
Extends DeviceCreateInfo PhysicalDeviceShaderDrawParametersFeatures = ()
829829
Extends DeviceCreateInfo PhysicalDeviceShaderFloat16Int8Features = ()
830830
Extends DeviceCreateInfo PhysicalDeviceHostQueryResetFeatures = ()
831+
Extends DeviceCreateInfo PhysicalDeviceGlobalPriorityQueryFeaturesEXT = ()
831832
Extends DeviceCreateInfo PhysicalDeviceDeviceMemoryReportFeaturesEXT = ()
832833
Extends DeviceCreateInfo DeviceDeviceMemoryReportCreateInfoEXT = ()
833834
Extends DeviceCreateInfo PhysicalDeviceDescriptorIndexingFeatures = ()
@@ -1049,6 +1050,7 @@ type family Extends (a :: [Type] -> Type) (b :: Type) :: Constraint where
10491050
Extends PhysicalDeviceFeatures2 PhysicalDeviceInheritedViewportScissorFeaturesNV = ()
10501051
Extends PhysicalDeviceFeatures2 PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT = ()
10511052
Extends PhysicalDeviceFeatures2 PhysicalDeviceProvokingVertexFeaturesEXT = ()
1053+
Extends PhysicalDeviceFeatures2 PhysicalDeviceRayTracingMotionBlurFeaturesNV = ()
10521054
Extends PhysicalDeviceImageFormatInfo2 PhysicalDeviceExternalImageFormatInfo = ()
10531055
Extends PhysicalDeviceImageFormatInfo2 ImageFormatListCreateInfo = ()
10541056
Extends PhysicalDeviceImageFormatInfo2 PhysicalDeviceImageDrmFormatModifierInfoEXT = ()
@@ -1104,7 +1106,6 @@ type family Extends (a :: [Type] -> Type) (b :: Type) :: Constraint where
11041106
Extends PhysicalDeviceProperties2 PhysicalDeviceFragmentShadingRateEnumsPropertiesNV = ()
11051107
Extends PhysicalDeviceProperties2 PhysicalDeviceProvokingVertexPropertiesEXT = ()
11061108
Extends PhysicalDeviceProperties2 PhysicalDeviceDrmPropertiesEXT = ()
1107-
Extends PhysicalDeviceProperties2 PhysicalDeviceRayTracingMotionBlurFeaturesNV = ()
11081109
Extends PhysicalDeviceSurfaceInfo2KHR SurfaceFullScreenExclusiveInfoEXT = ()
11091110
Extends PhysicalDeviceSurfaceInfo2KHR SurfaceFullScreenExclusiveWin32InfoEXT = ()
11101111
Extends PipelineColorBlendStateCreateInfo PipelineColorBlendAdvancedStateCreateInfoEXT = ()

src/Vulkan/Core10/CommandBuffer.hs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,9 @@ foreign import ccall
537537
--
538538
-- - Host access to @commandBuffer@ /must/ be externally synchronized
539539
--
540+
-- - Host access to the 'Vulkan.Core10.Handles.CommandPool' that
541+
-- @commandBuffer@ was allocated from /must/ be externally synchronized
542+
--
540543
-- == Return Codes
541544
--
542545
-- [<https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#fundamentals-successcodes Success>]

src/Vulkan/Core10/CommandBufferBuilding.hs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7106,6 +7106,9 @@ foreign import ccall
71067106
-- - #VUID-vkCmdClearColorImage-image-00007# @image@ /must/ not have a
71077107
-- compressed or depth\/stencil format
71087108
--
7109+
-- - #VUID-vkCmdClearColorImage-pColor-04961# @pColor@ /must/ be a valid
7110+
-- pointer to a 'ClearColorValue' union
7111+
--
71097112
-- - #VUID-vkCmdClearColorImage-commandBuffer-01805# If @commandBuffer@
71107113
-- is an unprotected command buffer, then @image@ /must/ not be a
71117114
-- protected image
@@ -11449,6 +11452,10 @@ instance Zero ImageResolve where
1144911452
-- a depth\/stencil format) of
1145011453
-- 'Vulkan.Core10.Enums.AttachmentLoadOp.ATTACHMENT_LOAD_OP_CLEAR'
1145111454
--
11455+
-- - #VUID-VkRenderPassBeginInfo-clearValueCount-04962# If
11456+
-- @clearValueCount@ is not @0@, @pClearValues@ /must/ be a valid
11457+
-- pointer to an array of @clearValueCount@ 'ClearValue' unions
11458+
--
1145211459
-- - #VUID-VkRenderPassBeginInfo-renderPass-00904# @renderPass@ /must/ be
1145311460
-- <https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#renderpass-compatibility compatible>
1145411461
-- with the @renderPass@ member of the

src/Vulkan/Core10/Device.hs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ import {-# SOURCE #-} Vulkan.Extensions.VK_NV_fragment_shader_barycentric (Physi
120120
import {-# SOURCE #-} Vulkan.Extensions.VK_EXT_fragment_shader_interlock (PhysicalDeviceFragmentShaderInterlockFeaturesEXT)
121121
import {-# SOURCE #-} Vulkan.Extensions.VK_NV_fragment_shading_rate_enums (PhysicalDeviceFragmentShadingRateEnumsFeaturesNV)
122122
import {-# SOURCE #-} Vulkan.Extensions.VK_KHR_fragment_shading_rate (PhysicalDeviceFragmentShadingRateFeaturesKHR)
123+
import {-# SOURCE #-} Vulkan.Extensions.VK_EXT_global_priority_query (PhysicalDeviceGlobalPriorityQueryFeaturesEXT)
123124
import {-# SOURCE #-} Vulkan.Core12.Promoted_From_VK_EXT_host_query_reset (PhysicalDeviceHostQueryResetFeatures)
124125
import {-# SOURCE #-} Vulkan.Extensions.VK_EXT_image_robustness (PhysicalDeviceImageRobustnessFeaturesEXT)
125126
import {-# SOURCE #-} Vulkan.Core12.Promoted_From_VK_KHR_imageless_framebuffer (PhysicalDeviceImagelessFramebufferFeatures)
@@ -745,6 +746,7 @@ instance es ~ '[] => Zero (DeviceQueueCreateInfo es) where
745746
-- 'Vulkan.Extensions.VK_EXT_fragment_shader_interlock.PhysicalDeviceFragmentShaderInterlockFeaturesEXT',
746747
-- 'Vulkan.Extensions.VK_NV_fragment_shading_rate_enums.PhysicalDeviceFragmentShadingRateEnumsFeaturesNV',
747748
-- 'Vulkan.Extensions.VK_KHR_fragment_shading_rate.PhysicalDeviceFragmentShadingRateFeaturesKHR',
749+
-- 'Vulkan.Extensions.VK_EXT_global_priority_query.PhysicalDeviceGlobalPriorityQueryFeaturesEXT',
748750
-- 'Vulkan.Core12.Promoted_From_VK_EXT_host_query_reset.PhysicalDeviceHostQueryResetFeatures',
749751
-- 'Vulkan.Extensions.VK_EXT_image_robustness.PhysicalDeviceImageRobustnessFeaturesEXT',
750752
-- 'Vulkan.Core12.Promoted_From_VK_KHR_imageless_framebuffer.PhysicalDeviceImagelessFramebufferFeatures',
@@ -962,6 +964,7 @@ instance Extensible DeviceCreateInfo where
962964
| Just Refl <- eqT @e @PhysicalDeviceDescriptorIndexingFeatures = Just f
963965
| Just Refl <- eqT @e @DeviceDeviceMemoryReportCreateInfoEXT = Just f
964966
| Just Refl <- eqT @e @PhysicalDeviceDeviceMemoryReportFeaturesEXT = Just f
967+
| Just Refl <- eqT @e @PhysicalDeviceGlobalPriorityQueryFeaturesEXT = Just f
965968
| Just Refl <- eqT @e @PhysicalDeviceHostQueryResetFeatures = Just f
966969
| Just Refl <- eqT @e @PhysicalDeviceShaderFloat16Int8Features = Just f
967970
| Just Refl <- eqT @e @PhysicalDeviceShaderDrawParametersFeatures = Just f

0 commit comments

Comments
 (0)