Skip to content

Commit 70d8cca

Browse files
authored
Merge pull request #452 from expipiplus1/vulkan-update-v1.3.236
Bump API version to v1.3.236
2 parents 73cacc1 + 7c5212e commit 70d8cca

File tree

247 files changed

+2828
-1342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+2828
-1342
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ jobs:
293293
name: vulkan-haskell
294294
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
295295

296-
- run: nix-build --argstr compiler ghc8107 -A generate-new
296+
- run: nix-build -A generate-new
297297

298298
nix-shell-profiling:
299299
runs-on: ubuntu-latest

VulkanMemoryAllocator/VulkanMemoryAllocator.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22

3-
-- This file has been generated from package.yaml by hpack version 0.34.7.
3+
-- This file has been generated from package.yaml by hpack version 0.35.0.
44
--
55
-- see: https://github.com/sol/hpack
66

@@ -95,6 +95,7 @@ library
9595
, transformers
9696
, vector
9797
, vulkan >=3.6 && <3.25
98+
default-language: Haskell2010
9899
if flag(safe-foreign-calls)
99100
cpp-options: -DSAFE_FOREIGN_CALLS
100101
if flag(vma-ndebug)
@@ -125,4 +126,3 @@ library
125126
else
126127
extra-libraries:
127128
c++ c++abi
128-
default-language: Haskell2010

VulkanMemoryAllocator/src/VulkanMemoryAllocator.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ module VulkanMemoryAllocator ( createAllocator
184184
, VirtualAllocationInfo(..)
185185
) where
186186

187+
import Data.Bits (Bits)
188+
import Data.Bits (FiniteBits)
187189
import Vulkan (AllocationCallbacks)
188190
import Vulkan (BindBufferMemoryInfo)
189191
import Vulkan (BindImageMemoryInfo)
@@ -273,8 +275,6 @@ import Vulkan.NamedType ((:::))
273275
import Vulkan.Zero (Zero)
274276
import Vulkan.Zero (Zero(..))
275277
import Control.Monad.IO.Class (MonadIO)
276-
import Data.Bits (Bits)
277-
import Data.Bits (FiniteBits)
278278
import Data.Typeable (Typeable)
279279
import Foreign.C.Types (CChar)
280280
import Foreign.C.Types (CFloat)

changelog.md

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## WIP
44

5+
## [3.24.1] - 2022-12-27
6+
- Bump API version to v1.3.236
7+
58
## [3.24] - 2022-12-27
69
- Bump API version to v1.3.235
710

default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let
1313
vulkan-validation-layers
1414
];
1515

16-
generator-ghc-version = "8.10.7";
16+
generator-ghc-version = "9.2.4";
1717

1818
packages = p:
1919
with p;

generate-new/Vulkan-Docs

Submodule Vulkan-Docs updated 66 files

generate-new/generate-new.cabal

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.0
22

3-
-- This file has been generated from package.yaml by hpack version 0.34.7.
3+
-- This file has been generated from package.yaml by hpack version 0.35.0.
44
--
55
-- see: https://github.com/sol/hpack
66

@@ -152,7 +152,7 @@ library
152152
, pandoc
153153
, parsec
154154
, parsers
155-
, polysemy >=1.4 && <1.7
155+
, polysemy >=1.4 && <1.8
156156
, pretty-show
157157
, prettyprinter
158158
, regex-applicative
@@ -260,7 +260,7 @@ library khronos-spec
260260
, pandoc
261261
, parsec
262262
, parsers
263-
, polysemy >=1.4 && <1.7
263+
, polysemy >=1.4 && <1.8
264264
, pretty-show
265265
, prettyprinter
266266
, regex-applicative
@@ -364,7 +364,7 @@ executable vk
364364
, pandoc
365365
, parsec
366366
, parsers
367-
, polysemy >=1.4 && <1.7
367+
, polysemy >=1.4 && <1.8
368368
, pretty-show
369369
, prettyprinter
370370
, regex-applicative
@@ -471,7 +471,7 @@ executable vma
471471
, pandoc
472472
, parsec
473473
, parsers
474-
, polysemy >=1.4 && <1.7
474+
, polysemy >=1.4 && <1.8
475475
, pretty-show
476476
, prettyprinter
477477
, regex-applicative
@@ -576,7 +576,7 @@ executable xr
576576
, pandoc
577577
, parsec
578578
, parsers
579-
, polysemy >=1.4 && <1.7
579+
, polysemy >=1.4 && <1.8
580580
, pretty-show
581581
, prettyprinter
582582
, regex-applicative

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

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
12
module Khronos.AssignModules
23
( assignModules
34
) where

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ module Khronos.SPIRVElements
55
) where
66

77
import CType ( CType(TypeName) )
8-
import Data.Bits
98
import Data.Foldable
109
import qualified Data.HashMap.Strict as HM
1110
import Data.List.Extra ( nubOrd )
@@ -27,7 +26,7 @@ import Marshal.Struct ( MarshaledStruct
2726
, msMembers
2827
, msmScheme
2928
)
30-
import Polysemy ( MemberWithError )
29+
import Polysemy ( Member )
3130
import Polysemy.Input
3231
import qualified Prelude
3332
import Prettyprinter
@@ -41,6 +40,7 @@ import Render.Type.Preserve ( Preserve(DoNotPreserve) )
4140
import Render.Names
4241
import Spec.Types
4342
import Text.InterpolatedString.Perl6.Unindented
43+
import Language.Haskell.TH.Syntax (mkNameG_v)
4444

4545
renderSPIRVElements
4646
:: (HasErr r, HasRenderParams r, HasSpecInfo r, HasRenderedNames r)
@@ -57,7 +57,7 @@ renderSPIRVElements exts caps structs =
5757
renderCaps caps
5858

5959
type HasMarshalledStructs r
60-
= MemberWithError (Input (CName -> Maybe (MarshaledStruct AStruct))) r
60+
= Member (Input (CName -> Maybe (MarshaledStruct AStruct))) r
6161

6262
renderExts
6363
:: ( HasRenderElem r
@@ -330,9 +330,9 @@ parseVersion t = do
330330

331331
bespokeStuff :: (HasRenderParams r, HasRenderElem r) => Sem r ()
332332
bespokeStuff = do
333-
tellImport ''Bits
334-
tellImport '(.&.)
335-
tellImport 'zeroBits
333+
tellImport (mkNameG_v "base" "Data.Bits" ".&.")
334+
tellImport (mkName "Data.Bits.Bits")
335+
tellImport (mkName "Data.Bits.zeroBits")
336336
tellDoc [qqi|
337337
-- | Check if the intersection of bits is non-zero
338338
(.&&.) :: Bits a => a -> a -> Bool

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{-# language QuasiQuotes #-}
2+
{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
23
module Khronos.Versions.OpenXR
34
( specVersions
45
) where
@@ -10,8 +11,7 @@ import Polysemy
1011
import Polysemy.Input
1112
import Relude
1213
import Text.InterpolatedString.Perl6.Unindented
13-
14-
import Data.Bits
14+
import Language.Haskell.TH.Syntax (mkName, mkNameG_v)
1515

1616
import Error
1717
import Haskell.Name
@@ -105,10 +105,10 @@ versionConstruction = genRe "version construction" $ do
105105
tellImport ''Word16
106106
tellImport ''Word32
107107
tellImport ''Word64
108-
tellImport '(.&.)
109-
tellImport '(.|.)
110-
tellImport 'shiftL
111-
tellImport 'shiftR
108+
tellImport (mkNameG_v "base" "Data.Bits" ".&.")
109+
tellImport (mkNameG_v "base" "Data.Bits" ".|.")
110+
tellImport (mkName "Data.Bits.shiftL")
111+
tellImport (mkName "Data.Bits.shiftR")
112112
let p = mkPatternName "XR_MAKE_VERSION"
113113
tellExport (EPat p)
114114
let patMajor = TermName ("_" <> unName (mkPatternName "XR_VERSION_MAJOR"))

generate-new/package.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ default-extensions:
1212
- BlockArguments
1313
- ConstraintKinds
1414
- DataKinds
15-
- DeriveFunctor
15+
- DeepSubsumption
1616
- DeriveFoldable
17-
- DeriveTraversable
17+
- DeriveFunctor
1818
- DeriveGeneric
19+
- DeriveTraversable
1920
- DerivingVia
2021
- DisambiguateRecordFields
2122
- DuplicateRecordFields
@@ -121,7 +122,7 @@ dependencies:
121122
- pandoc
122123
- parsec
123124
- parsers
124-
- polysemy >= 1.4 && < 1.7
125+
- polysemy >= 1.4 && < 1.8
125126
- pretty-show
126127
- prettyprinter
127128
- regex-applicative

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

+26-18
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/src/Text/Pandoc/Writers/Haddock.hs b/src/Text/Pandoc/Writers/Haddock.hs
2-
index 9d8c5ec41..139510ecf 100644
2+
index dfd89bc54..a31132ef1 100644
33
--- a/src/Text/Pandoc/Writers/Haddock.hs
44
+++ b/src/Text/Pandoc/Writers/Haddock.hs
5-
@@ -121,9 +121,11 @@ blockToHaddock opts (Table _ blkCapt specs thead tbody tfoot) = do
5+
@@ -131,9 +131,11 @@ blockToHaddock opts (Table _ blkCapt specs thead tbody tfoot) = do
66
let caption'' = if null caption
77
then empty
88
else blankline <> caption' <> blankline
@@ -17,10 +17,10 @@ index 9d8c5ec41..139510ecf 100644
1717
blockToHaddock opts (BulletList items) = do
1818
contents <- mapM (bulletListItemToHaddock opts) items
1919
diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs
20-
index e41273b27..b34e440af 100644
20+
index f6a207991..746d01602 100644
2121
--- a/src/Text/Pandoc/Writers/Markdown.hs
2222
+++ b/src/Text/Pandoc/Writers/Markdown.hs
23-
@@ -640,7 +640,7 @@ blockToMarkdown' opts t@(Table _ blkCapt specs thead tbody tfoot) = do
23+
@@ -622,7 +622,7 @@ blockToMarkdown' opts t@(Table _ blkCapt specs thead tbody tfoot) = do
2424
| isEnabled Ext_grid_tables opts &&
2525
writerColumns opts >= 8 * numcols -> (id,) <$>
2626
gridTable opts blockListToMarkdown
@@ -30,10 +30,10 @@ index e41273b27..b34e440af 100644
3030
isEnabled Ext_pipe_tables opts -> do
3131
rawHeaders <- padRow <$> mapM (blockListToMarkdown opts) headers
3232
diff --git a/src/Text/Pandoc/Writers/Muse.hs b/src/Text/Pandoc/Writers/Muse.hs
33-
index bf3265107..d1a4c5a31 100644
33+
index f3eecceb8..90fce5fa1 100644
3434
--- a/src/Text/Pandoc/Writers/Muse.hs
3535
+++ b/src/Text/Pandoc/Writers/Muse.hs
36-
@@ -264,7 +264,7 @@ blockToMuse (Table _ blkCapt specs thead tbody tfoot) =
36+
@@ -266,7 +266,7 @@ blockToMuse (Table _ blkCapt specs thead tbody tfoot) =
3737
then simpleTable caption headers rows
3838
else do
3939
opts <- asks envOptions
@@ -43,10 +43,10 @@ index bf3265107..d1a4c5a31 100644
4343
(caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot
4444
blocksToDoc opts blocks =
4545
diff --git a/src/Text/Pandoc/Writers/RST.hs b/src/Text/Pandoc/Writers/RST.hs
46-
index 43bf382b7..98b4ef3f6 100644
46+
index 021674b34..a4cc1f429 100644
4747
--- a/src/Text/Pandoc/Writers/RST.hs
4848
+++ b/src/Text/Pandoc/Writers/RST.hs
49-
@@ -296,15 +296,16 @@ blockToRST (Table _ blkCapt specs thead tbody tfoot) = do
49+
@@ -322,15 +322,16 @@ blockToRST (Table _ blkCapt specs thead tbody tfoot) = do
5050
return result
5151
opts <- gets stOptions
5252
let isSimple = all (== 0) widths && length widths > 1
@@ -66,29 +66,29 @@ index 43bf382b7..98b4ef3f6 100644
6666
headers rows
6767
return $ blankline $$
6868
diff --git a/src/Text/Pandoc/Writers/Shared.hs b/src/Text/Pandoc/Writers/Shared.hs
69-
index 642b33933..7c341df7b 100644
69+
index 64cd85997..9ae09809c 100644
7070
--- a/src/Text/Pandoc/Writers/Shared.hs
7171
+++ b/src/Text/Pandoc/Writers/Shared.hs
72-
@@ -211,12 +211,17 @@ gridTable :: (Monad m, HasChars a)
72+
@@ -236,12 +236,17 @@ gridTable :: (Monad m, HasChars a)
7373
=> WriterOptions
74-
-> (WriterOptions -> [Block] -> m (Doc a))
75-
-> Bool -- ^ headless
74+
-> (WriterOptions -> [Block] -> m (Doc a)) -- ^ format Doc writer
75+
-> Bool -- ^ headless
7676
+ -> Bool
7777
+ -- ^ strict wrapping, this applies when wrapping with given widths.
7878
+ -- If it is false then the columns may be wider than specified. They
7979
+ -- may be widened to accomodate the contents generated by blocksToDoc
8080
+ -- at their minimum width rendering.
81-
-> [Alignment]
82-
-> [Double]
83-
-> [[Block]]
84-
-> [[[Block]]]
81+
-> [Alignment] -- ^ column alignments
82+
-> [Double] -- ^ column widths
83+
-> [[Block]] -- ^ table header row
84+
-> [[[Block]]] -- ^ table body rows
8585
-> m (Doc a)
8686
-gridTable opts blocksToDoc headless aligns widths headers rows = do
8787
+gridTable opts blocksToDoc headless strictWrapping aligns widths headers rows = do
8888
-- the number of columns will be used in case of even widths
89-
let numcols = maximum (length aligns : length widths :
89+
let numcols = maximum (length aligns :| length widths :
9090
map length (headers:rows))
91-
@@ -238,7 +243,15 @@ gridTable opts blocksToDoc headless aligns widths headers rows = do
91+
@@ -263,7 +268,15 @@ gridTable opts blocksToDoc headless aligns widths headers rows = do
9292
rawRows' <- mapM
9393
(\cs -> zipWithM blocksToDoc columnOptions cs)
9494
rows
@@ -105,3 +105,11 @@ index 642b33933..7c341df7b 100644
105105
let handleGivenWidths widths' = handleGivenWidthsInChars
106106
(officialWidthsInChars widths')
107107
-- handleFullWidths tries to wrap cells to the page width or even
108+
@@ -307,6 +320,7 @@ gridTable opts blocksToDoc headless aligns widths headers rows = do
109+
-- on command line options, widths given in this specific table, and
110+
-- cells' contents
111+
let handleWidths
112+
+ | strictWrapping = handleFullWidths widths
113+
| writerWrapText opts == WrapNone = handleFullWidths widths
114+
| all (== 0) widths = handleZeroWidths widths
115+
| otherwise = handleGivenWidths widths

generate-new/readme.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ In an environment with `doxygen` (`nix-shell -p doxygen`), in the
3232
`VulkanMemoryAllocator/VulkanMemoryAllocator` directory.
3333

3434
```bash
35-
(cd src && sed -i -e 's|^GENERATE_DOCBOOK.*|GENERATE_DOCBOOK=YES|' -e 's|^BRIEF_MEMBER_DESC.*|BRIEF_MEMBER_DESC=NO|' Doxyfile && doxygen Doxyfile)
35+
(cd src &&
36+
sed -i -e 's|^GENERATE_DOCBOOK.*|GENERATE_DOCBOOK=YES|' \
37+
-e 's|^BRIEF_MEMBER_DESC.*|BRIEF_MEMBER_DESC=NO|' \
38+
-e 's|^PREDEFINED *=|PREDEFINED = VMA_STATS_STRING_ENABLED=1 |' \
39+
Doxyfile &&
40+
doxygen Doxyfile)
3641
```
3742

3843
The docbook documentation will be in `docs/docbook`.

0 commit comments

Comments
 (0)