Merge pull request #377 from expipiplus1/vulkan-update-v1.2.210

expipiplus1 · Apr 6, 2022 · 4e3905c · 4e3905c
2 parents 4f20aee + 11535c2
commit 4e3905c
Show file tree

Hide file tree

Showing 103 changed files with 6,154 additions and 1,908 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,17 +38,13 @@ jobs:
       if: matrix.os == 'ubuntu-20.04'
       run: |
         sudo apt-get update
-        sudo apt-get install libvulkan-dev glslang-tools libsdl2-dev
+        sudo apt-get install libsdl2-dev
 
     - name: Install system dependencies macOS
       if: matrix.os == 'macOS-latest'
       shell: bash
       run: |
         brew install pkg-config sdl2
-        brew tap apenngrace/homebrew-vulkan
-        brew install --cask vulkan-sdk --verbose ||
-          brew install --cask vulkan-sdk --verbose ||
-          brew install --cask vulkan-sdk --verbose
 
     - name: Install system dependencies Windows
       if: matrix.os == 'windows-latest'
@@ -61,27 +57,31 @@ jobs:
         printf "%s\n" "$SDL2/bin" >> "$GITHUB_PATH"
         printf "%s\n" "PKG_CONFIG_PATH=$SDL2/lib/pkgconfig" >> "$GITHUB_ENV"
 
-        choco install vulkan-sdk
-        VulkanSDK=$(cygpath --windows --absolute /c/VulkanSDK/*/)
-        printf "%s\n" "$VulkanSDK/Bin" >> "$GITHUB_PATH"
-        curl -L https://sdk.lunarg.com/sdk/download/latest/windows/vulkan-runtime-components.zip?u= > vulkan-runtime-components.zip
-        unzip vulkan-runtime-components.zip
-        printf "%s\n" "$(cygpath --windows --absolute VulkanRT-*/x64)" >> "$GITHUB_PATH"
-
         cat >> cabal.project <<EOF
         package sdl2
           extra-lib-dirs: $SDL2/lib/
           extra-include-dirs: $SDL2/include/SDL2/
+        EOF
 
-        package vulkan
-          extra-lib-dirs: $VulkanSDK/Lib/
-
-        package vulkan-utils
-          extra-include-dirs: $VulkanSDK/Include/
+    - name: Prepare Vulkan SDK
+      uses: humbletim/[email protected]
+      with:
+        vulkan-query-version: latest
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-use-cache: true
 
-        package VulkanMemoryAllocator
-          extra-include-dirs: $VulkanSDK/Include/
+    - name: Inform Cabal about Vulkan
+      shell: bash
+      run: |
+        cat >> cabal.project <<EOF
+        extra-lib-dirs: $VULKAN_SDK/lib/
+        extra-include-dirs: $VULKAN_SDK/include/
         EOF
+        printf "%s\n" "$VULKAN_SDK/bin" >> "$GITHUB_PATH"
+        if uname -s | grep -i mingw; then sep=';'; else sep=':'; fi
+        printf "%s\n" "PKG_CONFIG_PATH=${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}${sep}}$VULKAN_SDK/lib/pkgconfig" >> "$GITHUB_ENV"
+        # until this is fixed https://github.com/haskell/cabal/issues/7339
+        printf "%s\n" "DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}${sep}}$VULKAN_SDK/lib" >> "$GITHUB_ENV"
 
     - name: Remove openxr
       run: |
@@ -157,11 +157,14 @@ jobs:
           ${{ runner.os }}-stack-global-${{ matrix.stack-args }}
           ${{ runner.os }}-stack-global
 
+    - name: Set up yq
+      uses: frenck/action-setup-yq@v1
+
     - name: Install system dependencies Linux
       if: matrix.os == 'ubuntu-20.04'
       run: |
         sudo apt-get update
-        sudo apt-get install libvulkan-dev glslang-tools libsdl2-dev
+        sudo apt-get install libsdl2-dev
 
     - name: Install system dependencies Windows
       if: matrix.os == 'windows-latest'
@@ -174,47 +177,51 @@ jobs:
         printf "%s\n" "$SDL2/bin" >> "$GITHUB_PATH"
         printf "%s\n" "PKG_CONFIG_PATH=$SDL2/lib/pkgconfig" >> "$GITHUB_ENV"
 
-        choco install vulkan-sdk
-        VulkanSDK=$(cygpath --windows --absolute /c/VulkanSDK/*/)
-        printf "%s\n" "$VulkanSDK/Bin" >> "$GITHUB_PATH"
-        curl -L https://sdk.lunarg.com/sdk/download/latest/windows/vulkan-runtime-components.zip?u= > vulkan-runtime-components.zip
-        unzip vulkan-runtime-components.zip
-        printf "%s\n" "$(cygpath --windows --absolute VulkanRT-*/x64)" >> "$GITHUB_PATH"
-
-        cat >> stack.yaml <<EOF
-        extra-lib-dirs:
-          - $SDL2/lib/
-          - $VulkanSDK/Lib/
-        extra-include-dirs:
-          - $SDL2/include/SDL2/
-          - $VulkanSDK/Include/
-        EOF
+        yq --inplace ".\"extra-lib-dirs\" += [\"$SDL2/lib/\"]" stack.yaml
+        yq --inplace ".\"extra-include-dirs\" += [\"$SDL2/include/\"]" stack.yaml
 
     - name: Install system dependencies macOS
       if: matrix.os == 'macOS-latest'
       shell: bash
       run: |
         brew install pkg-config sdl2
-        brew tap apenngrace/homebrew-vulkan --verbose
-        brew install --cask vulkan-sdk --verbose ||
-          brew install --cask vulkan-sdk --verbose ||
-          brew install --cask vulkan-sdk --verbose
+
+    - name: Prepare Vulkan SDK
+      uses: humbletim/[email protected]
+      with:
+        vulkan-query-version: latest
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-use-cache: true
+
+    - name: Inform Stack about Vulkan
+      shell: bash
+      run: |
+        yq --inplace ".\"extra-lib-dirs\" += [\"$VULKAN_SDK/lib/\"]" stack.yaml
+        yq --inplace ".\"extra-include-dirs\" += [\"$VULKAN_SDK/include/\"]" stack.yaml
+        printf "%s\n" "$VULKAN_SDK/bin" >> "$GITHUB_PATH"
+        if uname -s | grep -i mingw; then sep=';'; else sep=':'; fi
+        printf "%s\n" "PKG_CONFIG_PATH=${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}${sep}}$VULKAN_SDK/lib/pkgconfig" >> "$GITHUB_ENV"
+        # until this is fixed https://github.com/haskell/cabal/issues/7339
+        printf "%s\n" "DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}${sep}}$VULKAN_SDK/lib" >> "$GITHUB_ENV"
 
     - name: Remove openxr
       run: |
         sed -ibak '/openxr/d' stack.yaml
 
     - name: Install dependencies
+      shell: bash
       run: stack build $ARGS --test --bench --only-dependencies
       env:
         ARGS: ${{ matrix.stack-args }}
 
     - name: Build
+      shell: bash
       run: stack build $ARGS
       env:
         ARGS: ${{ matrix.stack-args }}
 
     - name: Build documentation
+      shell: bash
       run: stack haddock $ARGS
       env:
         ARGS: ${{ matrix.stack-args }}

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.9
+version:        0.10
 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.17
+    , vulkan >=3.6 && <3.18
   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.10] - 2022-03-31
+- Bump VMA to 3.0.0
+  - Several breaking changes
+- Raise upper bound on `vulkan`
+
 ## [0.9] - 2022-02-05
 - Bump VMA
   - Vulkan 1.3 support

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