Merge pull request #286 from expipiplus1/joe-179

Bump vulkan to 1.2.179
expipiplus1 · Jun 6, 2021 · ff757bd · ff757bd
2 parents 6c040cb + 33386c4
commit ff757bd
Show file tree

Hide file tree

Showing 321 changed files with 11,062 additions and 5,071 deletions.
diff --git a/VulkanMemoryAllocator/VulkanMemoryAllocator b/VulkanMemoryAllocator/VulkanMemoryAllocator
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.5
+version:        0.5.1
 synopsis:       Bindings to the VulkanMemoryAllocator library
 category:       Graphics
 homepage:       https://github.com/expipiplus1/vulkan#readme
@@ -18,7 +18,7 @@ extra-source-files:
     readme.md
     changelog.md
     package.yaml
-    VulkanMemoryAllocator/src/vk_mem_alloc.h
+    VulkanMemoryAllocator/include/vk_mem_alloc.h
 
 source-repository head
   type: git
@@ -86,7 +86,7 @@ library
   ghc-options: -Wall -Wno-unticked-promoted-constructors -Wno-missing-pattern-synonym-signatures -Wno-unused-imports -Wno-missing-signatures -Wno-partial-type-signatures
   cxx-options: -std=c++11
   include-dirs:
-      VulkanMemoryAllocator/src
+      VulkanMemoryAllocator/include
   cxx-sources:
       src/lib.cpp
   extra-libraries:

diff --git a/VulkanMemoryAllocator/changelog.md b/VulkanMemoryAllocator/changelog.md
@@ -2,6 +2,9 @@
 
 ## WIP
 
+## [0.5.1] - 2021-06-05
+- Bump VMA, documentation changes
+
 ## [0.5] - 2021-03-31
 - Bump VMA, deprecates resizeAllocation
 

diff --git a/VulkanMemoryAllocator/package.yaml b/VulkanMemoryAllocator/package.yaml
@@ -1,5 +1,5 @@
 name: VulkanMemoryAllocator
-version: "0.5"
+version: "0.5.1"
 synopsis: Bindings to the VulkanMemoryAllocator library
 category: Graphics
 maintainer: Joe Hermaszewski <[email protected]>
@@ -8,12 +8,12 @@ extra-source-files:
   - readme.md
   - changelog.md
   - package.yaml
-  - VulkanMemoryAllocator/src/vk_mem_alloc.h
+  - VulkanMemoryAllocator/include/vk_mem_alloc.h
 
 library:
   source-dirs: src
   include-dirs:
-    VulkanMemoryAllocator/src
+    VulkanMemoryAllocator/include
   extra-libraries:
     stdc++
   cxx-sources:

diff --git a/VulkanMemoryAllocator/src/VulkanMemoryAllocator.hs b/VulkanMemoryAllocator/src/VulkanMemoryAllocator.hs
@@ -1358,7 +1358,7 @@ foreign import ccall
 -- Maps memory represented by given allocation to make it accessible to CPU
 -- code. When succeeded, @*ppData@ contains pointer to first byte of this
 -- memory. If the allocation is part of bigger @VkDeviceMemory@ block, the
--- pointer is correctly offseted to the beginning of region assigned to
+-- pointer is correctly offsetted to the beginning of region assigned to
 -- this particular allocation.
 --
 -- Mapping is internally reference-counted and synchronized, so despite raw
@@ -2061,7 +2061,7 @@ foreign import ccall
 --
 -- +-----------------------+--------------------------------------------------------+
 -- | allocationLocalOffset | Additional offset to be added while binding, relative  |
--- |                       | to the beginnig of the @allocation@. Normally it       |
+-- |                       | to the beginning of the @allocation@. Normally it      |
 -- |                       | should be 0.                                           |
 -- +-----------------------+--------------------------------------------------------+
 -- | pNext                 | A chain of structures to be attached to                |
@@ -2141,7 +2141,7 @@ foreign import ccall
 --
 -- +-----------------------+--------------------------------------------------------+
 -- | allocationLocalOffset | Additional offset to be added while binding, relative  |
--- |                       | to the beginnig of the @allocation@. Normally it       |
+-- |                       | to the beginning of the @allocation@. Normally it      |
 -- |                       | should be 0.                                           |
 -- +-----------------------+--------------------------------------------------------+
 -- | pNext                 | A chain of structures to be attached to                |
@@ -2574,7 +2574,7 @@ pattern ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT    = AllocatorCreateFlagBit
 -- @== VK_API_VERSION_1_0@. When it\'s @VK_API_VERSION_1_1@, the flag is
 -- ignored because the extension has been promoted to Vulkan 1.1.
 --
--- Using this extenion will automatically allocate dedicated blocks of
+-- Using this extension will automatically allocate dedicated blocks of
 -- memory for some buffers and images instead of suballocating place for
 -- them out of bigger memory blocks (as if you explicitly used
 -- 'ALLOCATION_CREATE_DEDICATED_MEMORY_BIT' flag) when it is recommended by

diff --git a/changelog.md b/changelog.md
@@ -2,6 +2,9 @@
 
 ## WIP
 
+## [3.10.2] - 2021-06-05
+- Bump API version to v1.2.179
+
 ## [3.10.1] - 2021-03-31
 - Bump API version to v1.2.174
 - Fix https://github.com/expipiplus1/vulkan/issues/266

diff --git a/generate-new/Vulkan-Docs b/generate-new/Vulkan-Docs
diff --git a/generate-new/generate-new.cabal b/generate-new/generate-new.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.0
 
--- This file has been generated from package.yaml by hpack version 0.34.2.
+-- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
 
@@ -85,7 +85,48 @@ library
       Paths_generate_new
   hs-source-dirs:
       src
-  default-extensions: BangPatterns BinaryLiterals BlockArguments ConstraintKinds DataKinds DeriveFunctor DeriveFoldable DeriveTraversable DeriveGeneric DerivingVia DisambiguateRecordFields DuplicateRecordFields EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MonadComprehensions MultiParamTypeClasses MultiWayIf NoImplicitPrelude OverloadedStrings ParallelListComp PartialTypeSignatures PatternSynonyms PolyKinds RankNTypes RecordWildCards RecursiveDo ScopedTypeVariables StandaloneDeriving TemplateHaskellQuotes TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns
+  default-extensions:
+      BangPatterns
+      BinaryLiterals
+      BlockArguments
+      ConstraintKinds
+      DataKinds
+      DeriveFunctor
+      DeriveFoldable
+      DeriveTraversable
+      DeriveGeneric
+      DerivingVia
+      DisambiguateRecordFields
+      DuplicateRecordFields
+      EmptyCase
+      FlexibleContexts
+      FlexibleInstances
+      FunctionalDependencies
+      GADTs
+      GeneralizedNewtypeDeriving
+      InstanceSigs
+      KindSignatures
+      LambdaCase
+      MonadComprehensions
+      MultiParamTypeClasses
+      MultiWayIf
+      NoImplicitPrelude
+      OverloadedStrings
+      ParallelListComp
+      PartialTypeSignatures
+      PatternSynonyms
+      PolyKinds
+      RankNTypes
+      RecordWildCards
+      RecursiveDo
+      ScopedTypeVariables
+      StandaloneDeriving
+      TemplateHaskellQuotes
+      TupleSections
+      TypeApplications
+      TypeFamilies
+      TypeOperators
+      ViewPatterns
   ghc-options: -Wall -fno-warn-unticked-promoted-constructors -fno-warn-name-shadowing -O2 -flate-specialise -fspecialise-aggressively
   build-depends:
       algebraic-graphs
@@ -148,7 +189,48 @@ library khronos-spec
       Paths_generate_new
   hs-source-dirs:
       khronos-spec
-  default-extensions: BangPatterns BinaryLiterals BlockArguments ConstraintKinds DataKinds DeriveFunctor DeriveFoldable DeriveTraversable DeriveGeneric DerivingVia DisambiguateRecordFields DuplicateRecordFields EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MonadComprehensions MultiParamTypeClasses MultiWayIf NoImplicitPrelude OverloadedStrings ParallelListComp PartialTypeSignatures PatternSynonyms PolyKinds RankNTypes RecordWildCards RecursiveDo ScopedTypeVariables StandaloneDeriving TemplateHaskellQuotes TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns
+  default-extensions:
+      BangPatterns
+      BinaryLiterals
+      BlockArguments
+      ConstraintKinds
+      DataKinds
+      DeriveFunctor
+      DeriveFoldable
+      DeriveTraversable
+      DeriveGeneric
+      DerivingVia
+      DisambiguateRecordFields
+      DuplicateRecordFields
+      EmptyCase
+      FlexibleContexts
+      FlexibleInstances
+      FunctionalDependencies
+      GADTs
+      GeneralizedNewtypeDeriving
+      InstanceSigs
+      KindSignatures
+      LambdaCase
+      MonadComprehensions
+      MultiParamTypeClasses
+      MultiWayIf
+      NoImplicitPrelude
+      OverloadedStrings
+      ParallelListComp
+      PartialTypeSignatures
+      PatternSynonyms
+      PolyKinds
+      RankNTypes
+      RecordWildCards
+      RecursiveDo
+      ScopedTypeVariables
+      StandaloneDeriving
+      TemplateHaskellQuotes
+      TupleSections
+      TypeApplications
+      TypeFamilies
+      TypeOperators
+      ViewPatterns
   ghc-options: -Wall -fno-warn-unticked-promoted-constructors -fno-warn-name-shadowing -O2 -flate-specialise -fspecialise-aggressively
   build-depends:
       algebraic-graphs
@@ -207,7 +289,48 @@ executable vk
       Paths_generate_new
   hs-source-dirs:
       vk
-  default-extensions: BangPatterns BinaryLiterals BlockArguments ConstraintKinds DataKinds DeriveFunctor DeriveFoldable DeriveTraversable DeriveGeneric DerivingVia DisambiguateRecordFields DuplicateRecordFields EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MonadComprehensions MultiParamTypeClasses MultiWayIf NoImplicitPrelude OverloadedStrings ParallelListComp PartialTypeSignatures PatternSynonyms PolyKinds RankNTypes RecordWildCards RecursiveDo ScopedTypeVariables StandaloneDeriving TemplateHaskellQuotes TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns
+  default-extensions:
+      BangPatterns
+      BinaryLiterals
+      BlockArguments
+      ConstraintKinds
+      DataKinds
+      DeriveFunctor
+      DeriveFoldable
+      DeriveTraversable
+      DeriveGeneric
+      DerivingVia
+      DisambiguateRecordFields
+      DuplicateRecordFields
+      EmptyCase
+      FlexibleContexts
+      FlexibleInstances
+      FunctionalDependencies
+      GADTs
+      GeneralizedNewtypeDeriving
+      InstanceSigs
+      KindSignatures
+      LambdaCase
+      MonadComprehensions
+      MultiParamTypeClasses
+      MultiWayIf
+      NoImplicitPrelude
+      OverloadedStrings
+      ParallelListComp
+      PartialTypeSignatures
+      PatternSynonyms
+      PolyKinds
+      RankNTypes
+      RecordWildCards
+      RecursiveDo
+      ScopedTypeVariables
+      StandaloneDeriving
+      TemplateHaskellQuotes
+      TupleSections
+      TypeApplications
+      TypeFamilies
+      TypeOperators
+      ViewPatterns
   ghc-options: -Wall -fno-warn-unticked-promoted-constructors -fno-warn-name-shadowing -O2 -flate-specialise -fspecialise-aggressively -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       algebraic-graphs
@@ -270,7 +393,48 @@ executable vma
       Paths_generate_new
   hs-source-dirs:
       vma
-  default-extensions: BangPatterns BinaryLiterals BlockArguments ConstraintKinds DataKinds DeriveFunctor DeriveFoldable DeriveTraversable DeriveGeneric DerivingVia DisambiguateRecordFields DuplicateRecordFields EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MonadComprehensions MultiParamTypeClasses MultiWayIf NoImplicitPrelude OverloadedStrings ParallelListComp PartialTypeSignatures PatternSynonyms PolyKinds RankNTypes RecordWildCards RecursiveDo ScopedTypeVariables StandaloneDeriving TemplateHaskellQuotes TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns
+  default-extensions:
+      BangPatterns
+      BinaryLiterals
+      BlockArguments
+      ConstraintKinds
+      DataKinds
+      DeriveFunctor
+      DeriveFoldable
+      DeriveTraversable
+      DeriveGeneric
+      DerivingVia
+      DisambiguateRecordFields
+      DuplicateRecordFields
+      EmptyCase
+      FlexibleContexts
+      FlexibleInstances
+      FunctionalDependencies
+      GADTs
+      GeneralizedNewtypeDeriving
+      InstanceSigs
+      KindSignatures
+      LambdaCase
+      MonadComprehensions
+      MultiParamTypeClasses
+      MultiWayIf
+      NoImplicitPrelude
+      OverloadedStrings
+      ParallelListComp
+      PartialTypeSignatures
+      PatternSynonyms
+      PolyKinds
+      RankNTypes
+      RecordWildCards
+      RecursiveDo
+      ScopedTypeVariables
+      StandaloneDeriving
+      TemplateHaskellQuotes
+      TupleSections
+      TypeApplications
+      TypeFamilies
+      TypeOperators
+      ViewPatterns
   ghc-options: -Wall -fno-warn-unticked-promoted-constructors -fno-warn-name-shadowing -O2 -flate-specialise -fspecialise-aggressively -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       algebraic-graphs
@@ -331,7 +495,48 @@ executable xr
       Paths_generate_new
   hs-source-dirs:
       xr
-  default-extensions: BangPatterns BinaryLiterals BlockArguments ConstraintKinds DataKinds DeriveFunctor DeriveFoldable DeriveTraversable DeriveGeneric DerivingVia DisambiguateRecordFields DuplicateRecordFields EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MonadComprehensions MultiParamTypeClasses MultiWayIf NoImplicitPrelude OverloadedStrings ParallelListComp PartialTypeSignatures PatternSynonyms PolyKinds RankNTypes RecordWildCards RecursiveDo ScopedTypeVariables StandaloneDeriving TemplateHaskellQuotes TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns
+  default-extensions:
+      BangPatterns
+      BinaryLiterals
+      BlockArguments
+      ConstraintKinds
+      DataKinds
+      DeriveFunctor
+      DeriveFoldable
+      DeriveTraversable
+      DeriveGeneric
+      DerivingVia
+      DisambiguateRecordFields
+      DuplicateRecordFields
+      EmptyCase
+      FlexibleContexts
+      FlexibleInstances
+      FunctionalDependencies
+      GADTs
+      GeneralizedNewtypeDeriving
+      InstanceSigs
+      KindSignatures
+      LambdaCase
+      MonadComprehensions
+      MultiParamTypeClasses
+      MultiWayIf
+      NoImplicitPrelude
+      OverloadedStrings
+      ParallelListComp
+      PartialTypeSignatures
+      PatternSynonyms
+      PolyKinds
+      RankNTypes
+      RecordWildCards
+      RecursiveDo
+      ScopedTypeVariables
+      StandaloneDeriving
+      TemplateHaskellQuotes
+      TupleSections
+      TypeApplications
+      TypeFamilies
+      TypeOperators
+      ViewPatterns
   ghc-options: -Wall -fno-warn-unticked-promoted-constructors -fno-warn-name-shadowing -O2 -flate-specialise -fspecialise-aggressively -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       algebraic-graphs

diff --git a/generate-new/khronos-spec/Khronos/Utils.hs b/generate-new/khronos-spec/Khronos/Utils.hs
@@ -33,11 +33,11 @@ extensionPatterns p = do
 versionDoc
   :: (HasRenderParams r, HasRenderElem r, HasErr r) => Version -> Sem r (Doc ())
 versionDoc v = do
-  tellImport (ConName "MAKE_VERSION")
+  tellImport (ConName "MAKE_API_VERSION")
   (ma, mi, pa) <- case versionBranch v of
     [ma]         -> pure (ma, 0, 0)
     [ma, mi]     -> pure (ma, mi, 0)
     [ma, mi, pa] -> pure (ma, mi, pa)
     []           -> throw "Version branch has no components"
     _            -> throw "Version branch has more than three components"
-  pure $ "MAKE_VERSION" <+> hsep (viaShow <$> [ma, mi, pa])
+  pure $ "MAKE_API_VERSION" <+> hsep (viaShow <$> [ma, mi, pa])
diff --git a/generate-new/package.yaml b/generate-new/package.yaml
@@ -103,8 +103,8 @@ dependencies:
 - ascii-progress
 - async-pool
 - base
-- bytestring
 - brittany
+- bytestring
 - casing
 - containers
 - data-default
+20 −22		include/vk_mem_alloc.h
+2 −2		premake/premake5.lua
+1 −1		src/VmaReplay/VmaUsage.h
+1 −1		src/VmaUsage.h