Merge pull request #452 from expipiplus1/vulkan-update-v1.3.236

Bump API version to v1.3.236

.github/workflows/ci.yml

@@ -293,7 +293,7 @@ jobs:
         name: vulkan-haskell
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
 
-    - run: nix-build --argstr compiler ghc8107 -A generate-new
+    - run: nix-build -A generate-new
 
   nix-shell-profiling:
     runs-on: ubuntu-latest

VulkanMemoryAllocator/VulkanMemoryAllocator.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 
--- This file has been generated from package.yaml by hpack version 0.34.7.
+-- This file has been generated from package.yaml by hpack version 0.35.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -95,6 +95,7 @@ library
     , transformers
     , vector
     , vulkan >=3.6 && <3.25
+  default-language: Haskell2010
   if flag(safe-foreign-calls)
     cpp-options: -DSAFE_FOREIGN_CALLS
   if flag(vma-ndebug)
@@ -125,4 +126,3 @@ library
       else
         extra-libraries:
             c++ c++abi
-  default-language: Haskell2010

VulkanMemoryAllocator/src/VulkanMemoryAllocator.hs

@@ -184,6 +184,8 @@ module VulkanMemoryAllocator  ( createAllocator
                               , VirtualAllocationInfo(..)
                               ) where
 
+import Data.Bits (Bits)
+import Data.Bits (FiniteBits)
 import Vulkan (AllocationCallbacks)
 import Vulkan (BindBufferMemoryInfo)
 import Vulkan (BindImageMemoryInfo)
@@ -273,8 +275,6 @@ import Vulkan.NamedType ((:::))
 import Vulkan.Zero (Zero)
 import Vulkan.Zero (Zero(..))
 import Control.Monad.IO.Class (MonadIO)
-import Data.Bits (Bits)
-import Data.Bits (FiniteBits)
 import Data.Typeable (Typeable)
 import Foreign.C.Types (CChar)
 import Foreign.C.Types (CFloat)

changelog.md

@@ -2,6 +2,9 @@
 
 ## WIP
 
+## [3.24.1] - 2022-12-27
+- Bump API version to v1.3.236
+
 ## [3.24] - 2022-12-27
 - Bump API version to v1.3.235
 

default.nix

@@ -13,7 +13,7 @@ let
     vulkan-validation-layers
   ];
 
-  generator-ghc-version = "8.10.7";
+  generator-ghc-version = "9.2.4";
 
   packages = p:
     with p;

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.7.
+-- This file has been generated from package.yaml by hpack version 0.35.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -152,7 +152,7 @@ library
     , pandoc
     , parsec
     , parsers
-    , polysemy >=1.4 && <1.7
+    , polysemy >=1.4 && <1.8
     , pretty-show
     , prettyprinter
     , regex-applicative
@@ -260,7 +260,7 @@ library khronos-spec
     , pandoc
     , parsec
     , parsers
-    , polysemy >=1.4 && <1.7
+    , polysemy >=1.4 && <1.8
     , pretty-show
     , prettyprinter
     , regex-applicative
@@ -364,7 +364,7 @@ executable vk
     , pandoc
     , parsec
     , parsers
-    , polysemy >=1.4 && <1.7
+    , polysemy >=1.4 && <1.8
     , pretty-show
     , prettyprinter
     , regex-applicative
@@ -471,7 +471,7 @@ executable vma
     , pandoc
     , parsec
     , parsers
-    , polysemy >=1.4 && <1.7
+    , polysemy >=1.4 && <1.8
     , pretty-show
     , prettyprinter
     , regex-applicative
@@ -576,7 +576,7 @@ executable xr
     , pandoc
     , parsec
     , parsers
-    , polysemy >=1.4 && <1.7
+    , polysemy >=1.4 && <1.8
     , pretty-show
     , prettyprinter
     , regex-applicative

generate-new/khronos-spec/Khronos/AssignModules.hs

@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 module Khronos.AssignModules
   ( assignModules
   ) where

generate-new/khronos-spec/Khronos/SPIRVElements.hs

@@ -5,7 +5,6 @@ module Khronos.SPIRVElements
   ) where
 
 import           CType                          ( CType(TypeName) )
-import           Data.Bits
 import           Data.Foldable
 import qualified Data.HashMap.Strict           as HM
 import           Data.List.Extra                ( nubOrd )
@@ -27,7 +26,7 @@ import           Marshal.Struct                 ( MarshaledStruct
                                                 , msMembers
                                                 , msmScheme
                                                 )
-import           Polysemy                       ( MemberWithError )
+import           Polysemy                       ( Member )
 import           Polysemy.Input
 import qualified Prelude
 import           Prettyprinter
@@ -41,6 +40,7 @@ import           Render.Type.Preserve           ( Preserve(DoNotPreserve) )
 import           Render.Names
 import           Spec.Types
 import           Text.InterpolatedString.Perl6.Unindented
+import Language.Haskell.TH.Syntax (mkNameG_v)
 
 renderSPIRVElements
   :: (HasErr r, HasRenderParams r, HasSpecInfo r, HasRenderedNames r)
@@ -57,7 +57,7 @@ renderSPIRVElements exts caps structs =
     renderCaps caps
 
 type HasMarshalledStructs r
-  = MemberWithError (Input (CName -> Maybe (MarshaledStruct AStruct))) r
+  = Member (Input (CName -> Maybe (MarshaledStruct AStruct))) r
 
 renderExts
   :: ( HasRenderElem r
@@ -330,9 +330,9 @@ parseVersion t = do
 
 bespokeStuff :: (HasRenderParams r, HasRenderElem r) => Sem r ()
 bespokeStuff = do
-  tellImport ''Bits
-  tellImport '(.&.)
-  tellImport 'zeroBits
+  tellImport (mkNameG_v "base" "Data.Bits" ".&.")
+  tellImport (mkName "Data.Bits.Bits")
+  tellImport (mkName "Data.Bits.zeroBits")
   tellDoc [qqi|
     -- | Check if the intersection of bits is non-zero
     (.&&.) :: Bits a => a -> a -> Bool

generate-new/khronos-spec/Khronos/Versions/OpenXR.hs

@@ -1,4 +1,5 @@
 {-# language QuasiQuotes #-}
+{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 module Khronos.Versions.OpenXR
   ( specVersions
   ) where
@@ -10,8 +11,7 @@ import           Polysemy
 import           Polysemy.Input
 import           Relude
 import           Text.InterpolatedString.Perl6.Unindented
-
-import           Data.Bits
+import           Language.Haskell.TH.Syntax (mkName, mkNameG_v)
 
 import           Error
 import           Haskell.Name
@@ -105,10 +105,10 @@ versionConstruction = genRe "version construction" $ do
   tellImport ''Word16
   tellImport ''Word32
   tellImport ''Word64
-  tellImport '(.&.)
-  tellImport '(.|.)
-  tellImport 'shiftL
-  tellImport 'shiftR
+  tellImport (mkNameG_v "base" "Data.Bits" ".&.")
+  tellImport (mkNameG_v "base" "Data.Bits" ".|.")
+  tellImport (mkName "Data.Bits.shiftL")
+  tellImport (mkName "Data.Bits.shiftR")
   let p = mkPatternName "XR_MAKE_VERSION"
   tellExport (EPat p)
   let patMajor = TermName ("_" <> unName (mkPatternName "XR_VERSION_MAJOR"))

generate-new/package.yaml

@@ -12,10 +12,11 @@ default-extensions:
 - BlockArguments
 - ConstraintKinds
 - DataKinds
-- DeriveFunctor
+- DeepSubsumption
 - DeriveFoldable
-- DeriveTraversable
+- DeriveFunctor
 - DeriveGeneric
+- DeriveTraversable
 - DerivingVia
 - DisambiguateRecordFields
 - DuplicateRecordFields
@@ -121,7 +122,7 @@ dependencies:
 - pandoc
 - parsec
 - parsers
-- polysemy >= 1.4 && < 1.7
+- polysemy >= 1.4 && < 1.8
 - pretty-show
 - prettyprinter
 - regex-applicative

generate-new/patches/pandoc-haddock-tables.patch

@@ -1,8 +1,8 @@
 diff --git a/src/Text/Pandoc/Writers/Haddock.hs b/src/Text/Pandoc/Writers/Haddock.hs
-index 9d8c5ec41..139510ecf 100644
+index dfd89bc54..a31132ef1 100644
 --- a/src/Text/Pandoc/Writers/Haddock.hs
 +++ b/src/Text/Pandoc/Writers/Haddock.hs
-@@ -121,9 +121,11 @@ blockToHaddock opts (Table _ blkCapt specs thead tbody tfoot) = do
+@@ -131,9 +131,11 @@ blockToHaddock opts (Table _ blkCapt specs thead tbody tfoot) = do
    let caption'' = if null caption
                       then empty
                       else blankline <> caption' <> blankline
@@ -17,10 +17,10 @@ index 9d8c5ec41..139510ecf 100644
  blockToHaddock opts (BulletList items) = do
    contents <- mapM (bulletListItemToHaddock opts) items
 diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs
-index e41273b27..b34e440af 100644
+index f6a207991..746d01602 100644
 --- a/src/Text/Pandoc/Writers/Markdown.hs
 +++ b/src/Text/Pandoc/Writers/Markdown.hs
-@@ -640,7 +640,7 @@ blockToMarkdown' opts t@(Table _ blkCapt specs thead tbody tfoot) = do
+@@ -622,7 +622,7 @@ blockToMarkdown' opts t@(Table _ blkCapt specs thead tbody tfoot) = do
              | isEnabled Ext_grid_tables opts &&
                 writerColumns opts >= 8 * numcols -> (id,) <$>
                  gridTable opts blockListToMarkdown
@@ -30,10 +30,10 @@ index e41273b27..b34e440af 100644
                isEnabled Ext_pipe_tables opts -> do
                  rawHeaders <- padRow <$> mapM (blockListToMarkdown opts) headers
 diff --git a/src/Text/Pandoc/Writers/Muse.hs b/src/Text/Pandoc/Writers/Muse.hs
-index bf3265107..d1a4c5a31 100644
+index f3eecceb8..90fce5fa1 100644
 --- a/src/Text/Pandoc/Writers/Muse.hs
 +++ b/src/Text/Pandoc/Writers/Muse.hs
-@@ -264,7 +264,7 @@ blockToMuse (Table _ blkCapt specs thead tbody tfoot) =
+@@ -266,7 +266,7 @@ blockToMuse (Table _ blkCapt specs thead tbody tfoot) =
      then simpleTable caption headers rows
      else do
        opts <- asks envOptions
@@ -43,10 +43,10 @@ index bf3265107..d1a4c5a31 100644
      (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot
      blocksToDoc opts blocks =
 diff --git a/src/Text/Pandoc/Writers/RST.hs b/src/Text/Pandoc/Writers/RST.hs
-index 43bf382b7..98b4ef3f6 100644
+index 021674b34..a4cc1f429 100644
 --- a/src/Text/Pandoc/Writers/RST.hs
 +++ b/src/Text/Pandoc/Writers/RST.hs
-@@ -296,15 +296,16 @@ blockToRST (Table _ blkCapt specs thead tbody tfoot) = do
+@@ -322,15 +322,16 @@ blockToRST (Table _ blkCapt specs thead tbody tfoot) = do
           return result
    opts <- gets stOptions
    let isSimple = all (== 0) widths && length widths > 1
@@ -66,29 +66,29 @@ index 43bf382b7..98b4ef3f6 100644
                    headers rows
    return $ blankline $$
 diff --git a/src/Text/Pandoc/Writers/Shared.hs b/src/Text/Pandoc/Writers/Shared.hs
-index 642b33933..7c341df7b 100644
+index 64cd85997..9ae09809c 100644
 --- a/src/Text/Pandoc/Writers/Shared.hs
 +++ b/src/Text/Pandoc/Writers/Shared.hs
-@@ -211,12 +211,17 @@ gridTable :: (Monad m, HasChars a)
+@@ -236,12 +236,17 @@ gridTable :: (Monad m, HasChars a)
            => WriterOptions
-           -> (WriterOptions -> [Block] -> m (Doc a))
-           -> Bool -- ^ headless
+           -> (WriterOptions -> [Block] -> m (Doc a)) -- ^ format Doc writer
+           -> Bool             -- ^ headless
 +          -> Bool
 +          -- ^ strict wrapping, this applies when wrapping with given widths.
 +          -- If it is false then the columns may be wider than specified. They
 +          -- may be widened to accomodate the contents generated by blocksToDoc
 +          -- at their minimum width rendering.
-           -> [Alignment]
-           -> [Double]
-           -> [[Block]]
-           -> [[[Block]]]
+           -> [Alignment]      -- ^ column alignments
+           -> [Double]         -- ^ column widths
+           -> [[Block]]        -- ^ table header row
+           -> [[[Block]]]      -- ^ table body rows
            -> m (Doc a)
 -gridTable opts blocksToDoc headless aligns widths headers rows = do
 +gridTable opts blocksToDoc headless strictWrapping aligns widths headers rows = do
    -- the number of columns will be used in case of even widths
-   let numcols = maximum (length aligns : length widths :
+   let numcols = maximum (length aligns :| length widths :
                             map length (headers:rows))
-@@ -238,7 +243,15 @@ gridTable opts blocksToDoc headless aligns widths headers rows = do
+@@ -263,7 +268,15 @@ gridTable opts blocksToDoc headless aligns widths headers rows = do
          rawRows' <- mapM
               (\cs -> zipWithM blocksToDoc columnOptions cs)
               rows
@@ -105,3 +105,11 @@ index 642b33933..7c341df7b 100644
    let handleGivenWidths widths' = handleGivenWidthsInChars
                                       (officialWidthsInChars widths')
    -- handleFullWidths tries to wrap cells to the page width or even
+@@ -307,6 +320,7 @@ gridTable opts blocksToDoc headless aligns widths headers rows = do
+   -- on command line options, widths given in this specific table, and
+   -- cells' contents
+   let handleWidths
++        | strictWrapping                     = handleFullWidths widths
+         | writerWrapText opts == WrapNone    = handleFullWidths widths
+         | all (== 0) widths                  = handleZeroWidths widths
+         | otherwise                          = handleGivenWidths widths

generate-new/readme.md

@@ -32,7 +32,12 @@ In an environment with `doxygen` (`nix-shell -p doxygen`), in the
 `VulkanMemoryAllocator/VulkanMemoryAllocator` directory.
 
 ```bash
-(cd src && sed -i -e 's|^GENERATE_DOCBOOK.*|GENERATE_DOCBOOK=YES|' -e 's|^BRIEF_MEMBER_DESC.*|BRIEF_MEMBER_DESC=NO|' Doxyfile && doxygen Doxyfile)
+(cd src &&
+  sed -i -e 's|^GENERATE_DOCBOOK.*|GENERATE_DOCBOOK=YES|' \
+         -e 's|^BRIEF_MEMBER_DESC.*|BRIEF_MEMBER_DESC=NO|' \
+         -e 's|^PREDEFINED *=|PREDEFINED = VMA_STATS_STRING_ENABLED=1 |' \
+         Doxyfile &&
+  doxygen Doxyfile)
 ```
 
 The docbook documentation will be in `docs/docbook`.