Merge pull request #487 from expipiplus1/bump2

Bump vulkan to v1.3.268
expipiplus1 · Oct 18, 2023 · c2731f8 · c2731f8
2 parents 432af58 + 6e5039a
commit c2731f8
Show file tree

Hide file tree

Showing 686 changed files with 48,429 additions and 7,154 deletions.
diff --git a/VulkanMemoryAllocator/VulkanMemoryAllocator.cabal b/VulkanMemoryAllocator/VulkanMemoryAllocator.cabal
@@ -5,7 +5,7 @@ cabal-version: 2.2
 -- see: https://github.com/sol/hpack
 
 name:           VulkanMemoryAllocator
-version:        0.11
+version:        0.11.0.1
 synopsis:       Bindings to the VulkanMemoryAllocator library
 category:       Graphics
 homepage:       https://github.com/expipiplus1/vulkan#readme
@@ -94,7 +94,7 @@ library
     , bytestring
     , transformers
     , vector
-    , vulkan >=3.6 && <3.26
+    , vulkan >=3.6 && <3.27
   default-language: Haskell2010
   if flag(safe-foreign-calls)
     cpp-options: -DSAFE_FOREIGN_CALLS

diff --git a/VulkanMemoryAllocator/changelog.md b/VulkanMemoryAllocator/changelog.md
@@ -2,6 +2,9 @@
 
 ## WIP
 
+## [0.11.0.1] - 2023-10-17
+- Raise upper bound on `vulkan`
+
 ## [0.11] - 2023-10-17
 - Bump VMA
 

diff --git a/VulkanMemoryAllocator/package.yaml b/VulkanMemoryAllocator/package.yaml
@@ -1,5 +1,5 @@
 name: VulkanMemoryAllocator
-version: "0.11"
+version: "0.11.0.1"
 synopsis: Bindings to the VulkanMemoryAllocator library
 category: Graphics
 maintainer: Ellie Hermaszewska <[email protected]>
@@ -20,7 +20,7 @@ library:
     src/lib.cpp
   dependencies:
     - base <5
-    - vulkan >= 3.6 && < 3.26
+    - vulkan >= 3.6 && < 3.27
     - bytestring
     - transformers
     - vector

diff --git a/changelog.md b/changelog.md
@@ -2,6 +2,12 @@
 
 ## WIP
 
+## [3.26] - 2023-10-17
+- Bump API version to v1.3.268
+  - A breaking change is that `VkBufferMemoryBarrier` has extensions,
+    and as such must be wrapped with `SomeStruct` when being passed
+    in lists, for example in `cmdPipelineBarrier`
+
 ## [3.25] - 2023-10-17
 - Bump API version to v1.3.246
   - VulkanSC is not included

diff --git a/examples/rays/Render.hs b/examples/rays/Render.hs
@@ -221,12 +221,13 @@ myRecordCommandBuffer Frame {..} imageIndex = do
       PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR
       zero
       []
-      [ zero { srcAccessMask = ACCESS_HOST_WRITE_BIT
-             , dstAccessMask = ACCESS_SHADER_READ_BIT
-             , buffer        = fCameraMatricesBuffer
-             , offset        = fCameraMatricesOffset
-             , size = fromIntegral (sizeOf (undefined :: CameraMatrices))
-             }
+      [ SomeStruct
+          zero { srcAccessMask = ACCESS_HOST_WRITE_BIT
+               , dstAccessMask = ACCESS_SHADER_READ_BIT
+               , buffer        = fCameraMatricesBuffer
+               , offset        = fCameraMatricesOffset
+               , size = fromIntegral (sizeOf (undefined :: CameraMatrices))
+               }
       ]
       []
 

diff --git a/generate-new/Vulkan-Docs b/generate-new/Vulkan-Docs
diff --git a/generate-new/src/Bespoke.hs b/generate-new/src/Bespoke.hs
@@ -1160,7 +1160,7 @@ directfb :: HasRenderParams r => [Sem r RenderElement]
 directfb = [voidData "IDirectFB", voidData "IDirectFBSurface"]
 
 screen :: HasRenderParams r => [Sem r RenderElement]
-screen = [voidData "_screen_window", voidData "screen_context"]
+screen = [voidData "_screen_window", voidData "_screen_context", voidData "_screen_buffer"]
 
 nvscisyncUnsized :: HasRenderParams r => [Sem r RenderElement]
 nvscisyncUnsized = [voidData "NvSciSyncFence"]

diff --git a/generate-new/src/Bespoke/MarshalParams.hs b/generate-new/src/Bespoke/MarshalParams.hs
@@ -99,6 +99,7 @@ isIntegral =
           , TypeName "size_t"
           , TypeName "VkDeviceSize"
           , TypeName "VkDeviceAddress"
+          , TypeName "VkDeviceOrHostAddressConstAMDX"
           , TypeName "VkDeviceOrHostAddressConstKHR"
           , TypeName "VkDeviceOrHostAddressKHR"
           , TypeName "VkBool32"
@@ -157,6 +158,7 @@ isPassAsPointerType' = \case
              , "IDirectFBSurface"
              , "IUnknown"
              , "jobject"
+             , "_screen_buffer"
              , "_screen_window"
              , "_screen_context"
              , "NvSciSyncFence"

diff --git a/generate-new/src/Bespoke/RenderParams.hs b/generate-new/src/Bespoke/RenderParams.hs
@@ -48,6 +48,7 @@ renderParams handles = r
             . ( case parent of
                   "VkPerformanceCounterResultKHR" -> (<> "Counter")
                   "VkDeviceOrHostAddressConstKHR" -> (<> "Const")
+                  "VkDeviceOrHostAddressConstAMDX" -> (<> "ConstAMDX")
                   "VkDescriptorDataEXT" -> articalize
                   _ -> id
               )

diff --git a/generate-new/src/Documentation/RunAsciiDoctor.hs b/generate-new/src/Documentation/RunAsciiDoctor.hs
@@ -82,8 +82,6 @@ asciidoctor specFlavor extensions vkPathRelative manTxt = do
         , vkPath </> "gen"
         , "-r"
         , vkPath </> "config/spec-macros.rb"
-        , "-r"
-        , vkPath </> "config/tilde_open_block.rb"
         ]
       SpecXr -> ["-r", vkPath </> "scripts/openxr-macros.rb"]
     adocOpts           = attribOpts ++ noteOpts ++ adocExts

diff --git a/openxr/openxr.cabal b/openxr/openxr.cabal
@@ -204,4 +204,4 @@ library
   if flag(use-vulkan-types)
     cpp-options: -DUSE_VULKAN_TYPES
     build-depends:
-        vulkan >=3.0 && <3.26
+        vulkan >=3.0 && <3.27
diff --git a/openxr/package.yaml b/openxr/package.yaml
@@ -32,7 +32,7 @@ library:
     cpp-options: -DTRACE_CALLS
   - condition: flag(use-vulkan-types)
     cpp-options: -DUSE_VULKAN_TYPES
-    dependencies: vulkan >= 3.0 && < 3.26
+    dependencies: vulkan >= 3.0 && < 3.27
   - condition: false
     other-modules: Paths_openxr
   ghc-options:

diff --git a/package.yaml b/package.yaml
@@ -1,5 +1,5 @@
 name: vulkan
-version: "3.25"
+version: "3.26"
 synopsis: Bindings to the Vulkan graphics API.
 description: Please see [the readme](https://github.com/expipiplus1/vulkan/#readme)
 category: Graphics