From c510174fae13deeea9cbcffcd3ac7e86894b7a03 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 9 Jun 2021 17:00:53 +0800 Subject: [PATCH 1/5] bump nixpkgs --- nix/nixpkgs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix index b4b30e2cf..7f385b4b2 100644 --- a/nix/nixpkgs.nix +++ b/nix/nixpkgs.nix @@ -1,8 +1,8 @@ let nixpkgsSrc = builtins.fetchTarball { url = - "https://github.com/nixos/nixpkgs/archive/1c2986bbb806c57f9470bf3231d8da7250ab9091.tar.gz"; # refs/heads/nixos-unstable - sha256 = "0y1275nzlmsys5rk7ivzbdc8cpjs9cbk0wz6yh3i2c57b8nbd3ym"; + "https://github.com/nixos/nixpkgs/archive/fbfb79400a08bf754e32b4d4fc3f7d8f8055cf94.tar.gz"; # refs/heads/nixos-unstable + sha256 = "0pgyx1l1gj33g5i9kwjar7dc3sal2g14mhfljcajj8bqzzrbc3za"; }; in import nixpkgsSrc { } From 127b85b0f2deac52d021fdb8d315cdba1e2c9858 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 9 Jun 2021 17:01:04 +0800 Subject: [PATCH 2/5] squash warning in utils --- utils/changelog.md | 1 + utils/src/Vulkan/Utils/Requirements/TH.hs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/changelog.md b/utils/changelog.md index 9e692dea1..69aee8439 100644 --- a/utils/changelog.md +++ b/utils/changelog.md @@ -1,6 +1,7 @@ # Change Log ## WIP +- Squash warning ## [0.5.0] - 2021-02-24 - Refactor module `Vulkan.Utils.ShaderQQ` diff --git a/utils/src/Vulkan/Utils/Requirements/TH.hs b/utils/src/Vulkan/Utils/Requirements/TH.hs index 7166db6b3..a77c6bc04 100644 --- a/utils/src/Vulkan/Utils/Requirements/TH.hs +++ b/utils/src/Vulkan/Utils/Requirements/TH.hs @@ -29,7 +29,7 @@ import Text.Read ( readMaybe ) import Vulkan.Requirement import Vulkan.Utils.Internal import Vulkan.Utils.Misc -import Vulkan.Version ( pattern MAKE_VERSION ) +import Vulkan.Version ( pattern MAKE_API_VERSION ) -- $setup -- >>> import Vulkan.Core11.Promoted_From_VK_KHR_multiview @@ -234,7 +234,7 @@ parse = separator mi <- word pa <- fromMaybe 0 <$> (separator *> optional word) - pure $ Version (MAKE_VERSION ma mi pa) + pure $ Version (MAKE_API_VERSION ma mi pa) feature = do s <- qual con From d7c9c453f3cb3cb43a0d82866a26833aa633a83e Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 9 Jun 2021 17:30:36 +0800 Subject: [PATCH 3/5] link to Matrix room in readme --- readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/readme.md b/readme.md index 39b17f157..a015afbc6 100644 --- a/readme.md +++ b/readme.md @@ -2,6 +2,9 @@ Slightly high level Haskell bindings to the Vulkan graphics API. +Join us on Matrix at +[#vulkan:monoid.al](https://matrix.to/#/#vulkan:monoid.al?via=monoid.al&via=matrix.org&via=nordgedanken.dev) + These bindings present an interface to Vulkan which looks like more idiomatic Haskell and which is much less verbose than the C API. Nevertheless, it retains access to all the functionality. If you find something you can do in the C From 37ad9dcf39f9f1b815ebc1368bd1ba379e091e28 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 9 Jun 2021 17:36:10 +0800 Subject: [PATCH 4/5] Add other modules to utils Also format package.yaml --- utils/package.yaml | 141 ++++++++++++++++++++++++--------------------- 1 file changed, 74 insertions(+), 67 deletions(-) diff --git a/utils/package.yaml b/utils/package.yaml index 0d5d69175..251220664 100644 --- a/utils/package.yaml +++ b/utils/package.yaml @@ -1,92 +1,99 @@ name: vulkan-utils -version: "0.5.0" +version: 0.5.0.1 synopsis: Utils for the vulkan package category: Graphics maintainer: Joe Hermaszewski github: expipiplus1/vulkan extra-source-files: - - readme.md - - changelog.md - - package.yaml - - src/Vulkan/Utils/gl_enums.h +- readme.md +- changelog.md +- package.yaml +- src/Vulkan/Utils/gl_enums.h library: source-dirs: src c-sources: cbits/DebugCallback.c other-modules: - - Vulkan.Utils.Internal + - Vulkan.Utils.Internal + - Vulkan.Utils.ShaderQQ.ShaderType + - Vulkan.Utils.ShaderQQ.Backend.Internal + - Vulkan.Utils.ShaderQQ.Backend.Glslang.Internal + - Vulkan.Utils.ShaderQQ.Backend.Shaderc.Internal + - Vulkan.Utils.ShaderQQ.GLSL + - Vulkan.Utils.ShaderQQ.HLSL + dependencies: - - base <5 - - bytestring - - containers - - dependent-map - - dependent-sum - - extra - - file-embed - - filepath - - resourcet >= 1.2.4 - - template-haskell - - temporary - - text - - transformers - - typed-process - - unordered-containers - - vector - - vulkan >= 3.6.14 && < 3.11 + - base <5 + - bytestring + - containers + - dependent-map + - dependent-sum + - extra + - file-embed + - filepath + - resourcet >= 1.2.4 + - template-haskell + - temporary + - text + - transformers + - typed-process + - unordered-containers + - vector + - vulkan >= 3.6.14 && < 3.11 tests: doctests: main: Doctests.hs - other-modules: "" + other-modules: '' source-dirs: - - test/doctest + - test/doctest dependencies: - - base - - doctest - - vulkan-utils + - base + - doctest + - vulkan-utils custom-setup: dependencies: - - base - - Cabal - - cabal-doctest >= 1 && <1.1 + - base + - Cabal + - cabal-doctest >= 1 && <1.1 ghc-options: - - -Wall +- -Wall default-extensions: - - ConstraintKinds - - DataKinds - - DefaultSignatures - - DeriveAnyClass - - DeriveFoldable - - DeriveFunctor - - DeriveTraversable - - DerivingStrategies - - DuplicateRecordFields - - FlexibleContexts - - FlexibleInstances - - GADTs - - GeneralizedNewtypeDeriving - - InstanceSigs - - LambdaCase - - MagicHash - - NamedFieldPuns - - NoMonomorphismRestriction - - OverloadedStrings - - PartialTypeSignatures - - PatternSynonyms - - PolyKinds - - QuantifiedConstraints - - RankNTypes - - RecordWildCards - - RoleAnnotations - - ScopedTypeVariables - - StandaloneDeriving - - Strict - - TupleSections - - TypeApplications - - TypeFamilyDependencies - - TypeOperators - - TypeSynonymInstances - - ViewPatterns +- ConstraintKinds +- DataKinds +- DefaultSignatures +- DeriveAnyClass +- DeriveFoldable +- DeriveFunctor +- DeriveTraversable +- DerivingStrategies +- DuplicateRecordFields +- FlexibleContexts +- FlexibleInstances +- GADTs +- GeneralizedNewtypeDeriving +- InstanceSigs +- LambdaCase +- MagicHash +- NamedFieldPuns +- NoMonomorphismRestriction +- OverloadedStrings +- PartialTypeSignatures +- PatternSynonyms +- PolyKinds +- QuantifiedConstraints +- RankNTypes +- RecordWildCards +- RoleAnnotations +- ScopedTypeVariables +- StandaloneDeriving +- Strict +- TupleSections +- TypeApplications +- TypeFamilyDependencies +- TypeOperators +- TypeSynonymInstances +- ViewPatterns From 9556b84708f4f3a933b5e7efc1c4ddd86fc287ed Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 9 Jun 2021 17:31:42 +0800 Subject: [PATCH 5/5] v0.5.0.1 - Squash warning --- utils/changelog.md | 2 ++ utils/vulkan-utils.cabal | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/changelog.md b/utils/changelog.md index 69aee8439..2574cc5c0 100644 --- a/utils/changelog.md +++ b/utils/changelog.md @@ -1,6 +1,8 @@ # Change Log ## WIP + +## [0.5.0.1] - 2021-06-09 - Squash warning ## [0.5.0] - 2021-02-24 diff --git a/utils/vulkan-utils.cabal b/utils/vulkan-utils.cabal index 4feb9f839..35115a871 100644 --- 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.0 +version: 0.5.0.1 synopsis: Utils for the vulkan package category: Graphics homepage: https://github.com/expipiplus1/vulkan#readme @@ -40,13 +40,13 @@ library Vulkan.Utils.QueueAssignment Vulkan.Utils.Requirements Vulkan.Utils.Requirements.TH - Vulkan.Utils.ShaderQQ.Interpolate Vulkan.Utils.ShaderQQ.Backend.Glslang Vulkan.Utils.ShaderQQ.Backend.Shaderc Vulkan.Utils.ShaderQQ.GLSL.Glslang Vulkan.Utils.ShaderQQ.GLSL.Shaderc Vulkan.Utils.ShaderQQ.HLSL.Glslang Vulkan.Utils.ShaderQQ.HLSL.Shaderc + Vulkan.Utils.ShaderQQ.Interpolate other-modules: Vulkan.Utils.Internal Vulkan.Utils.ShaderQQ.ShaderType