Merge pull request #362 from expipiplus1/v1.3.204

expipiplus1 · Feb 5, 2022 · 2ba4a95 · 2ba4a95
2 parents cdf7f9e + ddfe3fb
commit 2ba4a95
Show file tree

Hide file tree

Showing 15 changed files with 199 additions and 313 deletions.
diff --git a/VulkanMemoryAllocator/VulkanMemoryAllocator b/VulkanMemoryAllocator/VulkanMemoryAllocator
diff --git a/VulkanMemoryAllocator/VulkanMemoryAllocator.cabal b/VulkanMemoryAllocator/VulkanMemoryAllocator.cabal
@@ -1,11 +1,11 @@
 cabal-version: 2.2
 
--- This file has been generated from package.yaml by hpack version 0.34.6.
+-- This file has been generated from package.yaml by hpack version 0.34.5.
 --
 -- see: https://github.com/sol/hpack
 
 name:           VulkanMemoryAllocator
-version:        0.8
+version:        0.9
 synopsis:       Bindings to the VulkanMemoryAllocator library
 category:       Graphics
 homepage:       https://github.com/expipiplus1/vulkan#readme
@@ -96,7 +96,7 @@ library
     , bytestring
     , transformers
     , vector
-    , vulkan >=3.6 && <3.16
+    , vulkan >=3.6 && <3.17
   if flag(safe-foreign-calls)
     cpp-options: -DSAFE_FOREIGN_CALLS
   if flag(vma-ndebug)

diff --git a/VulkanMemoryAllocator/changelog.md b/VulkanMemoryAllocator/changelog.md
@@ -2,6 +2,11 @@
 
 ## WIP
 
+## [0.9] - 2022-02-05
+- Bump VMA
+  - Vulkan 1.3 support
+- Raise upper bound on `vulkan`
+
 ## [0.8] - 2022-01-14
 - Bump VMA
   - lost allocations stuff removed

diff --git a/VulkanMemoryAllocator/package.yaml b/VulkanMemoryAllocator/package.yaml
@@ -1,5 +1,5 @@
 name: VulkanMemoryAllocator
-version: "0.8"
+version: "0.9"
 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.16
+    - vulkan >= 3.6 && < 3.17
     - bytestring
     - transformers
     - vector

diff --git a/VulkanMemoryAllocator/src/VulkanMemoryAllocator.hs b/VulkanMemoryAllocator/src/VulkanMemoryAllocator.hs
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,8 @@
 # Change Log
 
 ## WIP
+
+## [3.16] - 2022-02-05
 - Bump API version to v1.3.204
 
 ## [3.15] - 2022-01-14

diff --git a/generate-new/vma/VMA/Documentation.hs b/generate-new/vma/VMA/Documentation.hs
@@ -26,15 +26,22 @@ loadAllDocumentation
   -- ^ Path to the @VulkanMemoryAllocator/docs/docbook@ directory
   -> Sem r (Documentee -> Maybe Documentation)
 loadAllDocumentation docbookDir = do
-  allDocs <-
+  allStructDocs <-
     liftIO
     $   filter (("struct" `isPrefixOf`) . takeFileName)
     .   fmap (docbookDir </>)
     .   filter (".xml" `List.isSuffixOf`)
     <$> listDirectory docbookDir
+  allGroupDocs <-
+    liftIO
+    $   filter (("group__" `isPrefixOf`) . takeFileName)
+    .   fmap (docbookDir </>)
+    .   filter (".xml" `List.isSuffixOf`)
+    <$> listDirectory docbookDir
   (errors, docs) <- partitionEithers <$> sequence
-    ( runErr (loadHeaderDocumentation (docbookDir </> "vk__mem__alloc_8h.xml"))
-    : (allDocs <&> \d -> runErr (loadDocumentation d))
+    (  runErr (loadHeaderDocumentation (docbookDir </> "vk__mem__alloc_8h.xml"))
+    : (allStructDocs <&> (runErr . loadDocumentation))
+    <> (allGroupDocs <&> (runErr . loadHeaderDocumentation))
     )
   unless (null errors) $ do
     sayErr "Errors while loading documentation:"
@@ -163,7 +170,7 @@ splitHeaderDocumentation isValid (Pandoc meta bs) =
       NamedSection name sectionBlocks rem
         | documentee <- TopLevel (CName name)
         , isValid documentee
-        , Plain [Str name1] : Plain [Str "vk_mem_alloc.h"] : Plain [Str "vk_mem_alloc.h"] : Plain [Str name2] : Para [Code ("", [], []) enumName] : sectionRem <-
+        , Plain [Str name1] : Plain _ : Plain _ : Plain [Str name2] : Para [Code ("", [], []) enumName] : sectionRem <-
           sectionBlocks
         , name == name1
         , name == name2
@@ -188,7 +195,7 @@ splitHeaderDocumentation isValid (Pandoc meta bs) =
         | Just name <- T.dropSuffix "()" nameWithParens
         , documentee <- TopLevel (CName name)
         , isValid documentee
-        , Plain [Str name1] : Plain [Str "vk_mem_alloc.h"] : Plain [Str "vk_mem_alloc.h"] : Plain [Str name2] : Para [Code ("", [], []) _funDecl] : sectionRem <-
+        , Plain [Str name1] : Plain _ : Plain _ : Plain [Str name2] : Para [Code ("", [], []) _funDecl] : sectionRem <-
           sectionBlocks
         , name == name1
         , name == name2

diff --git a/openxr/openxr.cabal b/openxr/openxr.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 
--- This file has been generated from package.yaml by hpack version 0.34.5.
+-- This file has been generated from package.yaml by hpack version 0.34.6.
 --
 -- see: https://github.com/sol/hpack
 
@@ -203,5 +203,5 @@ library
   if flag(use-vulkan-types)
     cpp-options: -DUSE_VULKAN_TYPES
     build-depends:
-        vulkan >=3.0 && <3.16
+        vulkan >=3.0 && <3.17
   default-language: Haskell2010
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.16
+    dependencies: vulkan >= 3.0 && < 3.17
   - condition: false
     other-modules: Paths_openxr
   ghc-options:

diff --git a/package.yaml b/package.yaml
@@ -1,5 +1,5 @@
 name: vulkan
-version: "3.15"
+version: "3.16"
 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/Extensions/VK_KHR_copy_commands2.hs-boot b/src/Vulkan/Extensions/VK_KHR_copy_commands2.hs-boot
diff --git a/utils/changelog.md b/utils/changelog.md
@@ -2,6 +2,9 @@
 
 ## WIP
 
+## [0.5.6] - 2022-02-05
+- Relax bounds on `vulkan`
+
 ## [0.5.5] - 2022-01-14
 - Relax bounds on `vulkan`
 - Squash warnings

diff --git a/utils/package.yaml b/utils/package.yaml
@@ -1,5 +1,5 @@
 name: vulkan-utils
-version: "0.5.5"
+version: "0.5.6"
 synopsis: Utils for the vulkan package
 category: Graphics
 maintainer: Ellie Hermaszewska <[email protected]>
@@ -39,7 +39,7 @@ library:
   - typed-process
   - unordered-containers
   - vector
-  - vulkan >= 3.6.14 && < 3.16
+  - vulkan >= 3.6.14 && < 3.17
 
 tests:
   doctests:

diff --git a/utils/vulkan-utils.cabal b/utils/vulkan-utils.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.24
 -- see: https://github.com/sol/hpack
 
 name:           vulkan-utils
-version:        0.5.5
+version:        0.5.6
 synopsis:       Utils for the vulkan package
 category:       Graphics
 homepage:       https://github.com/expipiplus1/vulkan#readme
@@ -113,7 +113,7 @@ library
     , typed-process
     , unordered-containers
     , vector
-    , vulkan >=3.6.14 && <3.16
+    , vulkan >=3.6.14 && <3.17
   default-language: Haskell2010
 
 test-suite doctests

diff --git a/vulkan.cabal b/vulkan.cabal
@@ -1,11 +1,11 @@
 cabal-version: 2.2
 
--- This file has been generated from package.yaml by hpack version 0.34.6.
+-- This file has been generated from package.yaml by hpack version 0.34.5.
 --
 -- see: https://github.com/sol/hpack
 
 name:           vulkan
-version:        3.15
+version:        3.16
 synopsis:       Bindings to the Vulkan graphics API.
 description:    Please see [the readme](https://github.com/expipiplus1/vulkan/#readme)
 category:       Graphics