Merge pull request #27 from WhalesState/d3d12-fix

Fix D3D12
blazium-engine · Jan 26, 2025 · 27f3cfa · 27f3cfa
2 parents 6d529e0 + 0715931
commit 27f3cfa
Showing 1 changed file with 38 additions and 16 deletions.
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
@@ -32,7 +32,8 @@ on:
 env:
   # Used for the cache key. Add version suffix to force clean build.
   GODOT_BASE_BRANCH: blazium-dev
-  SCONSFLAGS: verbose=yes warnings=no progress=no #d3d12=yes "mesa_libs=${{github.workspace}}/deps/mesa" "angle_libs=${{github.workspace}}/deps/angle"
+  SCONSFLAGS: verbose=yes warnings=no progress=no #"angle_libs=${{github.workspace}}/deps/angle"
+  D3D12FLAGS: d3d12=yes "mesa_libs=${{github.workspace}}/bin/build_deps/mesa" "agility_sdk_path=${{github.workspace}}/bin/build_deps/agility_sdk"
   SCONS_CACHE_MSVC_CONFIG: true
   DEPLOY_TYPE: windows
 
@@ -106,24 +107,28 @@ jobs:
             target: editor
             sconsflags: arch=x86_64  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
+            d3d12: true
 
           - name: Editor w/ Mono (64bit)
             cache-name: windows-editor-mono-64bit
             target: editor
             sconsflags: module_mono_enabled=yes arch=x86_64  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
+            d3d12: true
 
           - name: Editor (32bit)
             cache-name: windows-editor-32bit
             target: editor
             sconsflags: arch=x86_32  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
+            d3d12: true
 
           - name: Editor w/ Mono (32bit)
             cache-name: windows-editor-mono-32bit
             target: editor
             sconsflags: module_mono_enabled=yes arch=x86_32  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
+            d3d12: true
 
           - name: Editor (arm64)
             cache-name: windows-editor-arm64
@@ -132,6 +137,7 @@ jobs:
             mono: false
             arm: true
             skip: false
+            d3d12: true
 
           - name: Editor w/ Mono (arm64)
             cache-name: windows-editor-mono-arm64
@@ -140,6 +146,7 @@ jobs:
             mono: true
             arm: true
             skip: false
+            d3d12: true
 
           - name: Editor (arm32)
             cache-name: windows-editor-arm32
@@ -148,6 +155,7 @@ jobs:
             mono: false
             arm: true
             skip: false
+            d3d12: false
 
           - name: Editor w/ Mono (arm32)
             cache-name: windows-editor-mono-arm32
@@ -156,6 +164,7 @@ jobs:
             mono: true
             arm: true
             skip: false
+            d3d12: false
 
     steps:
       - name: Skip Action?
@@ -353,6 +362,7 @@ jobs:
           rm -rf temp_extract monoglue.tar.gz
 
       - name: Download Direct3D 12 SDK components
+        if: matrix.d3d12
         run: |
           python ./misc/scripts/install_d3d12_sdk_windows.py
 
@@ -361,12 +371,6 @@ jobs:
         with:
           angle_url_base: "https://github.com/godotengine/godot-angle-static/releases/download/chromium%2F6601.2/godot-angle-static"
           angle_folder: "${{ github.workspace }}/deps/angle"
-
-      - name: Download Mesa Libraries
-        uses: ./.github/actions/download-mesa-action
-        with:
-          mesa_url_base: "https://github.com/godotengine/godot-nir-static/releases/download/23.1.9-1/godot-nir-static"
-          mesa_folder: "${{ github.workspace }}/deps/mesa"
 
       - name: Compilation
         uses: ./.github/actions/godot-build
@@ -380,7 +384,6 @@ jobs:
         run: |
           ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=windows
 
-
       - name: Save Godot build cache
         uses: ./.github/actions/godot-cache-save
         with:
@@ -400,6 +403,10 @@ jobs:
           source: ${{ matrix.cache-name }}-${{ github.event.client_payload.type || 'nightly' }}.tar.gz
           out_dir: ${{ env.DEPLOY_TYPE }}/${{ github.event.client_payload.type || 'nightly' }}${{ startsWith(matrix.target, 'template_') && '/template' || '' }}
 
+      - name: Clean D3D12 deps
+        if: matrix.d3d12
+        run: |
+          rm -rf "${{ github.workspace }}/bin/build_deps"
 
       - name: Upload artifact
         uses: ./.github/actions/upload-artifact
@@ -441,104 +448,120 @@ jobs:
             target: template_release
             sconsflags: module_mono_enabled=yes arch=x86_64  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
+            d3d12: true
 
           - name: Template (64bit)
             cache-name: windows-template-64bit
             target: template_release
             sconsflags: arch=x86_64  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
+            d3d12: true
 
           - name: Template w/ Mono (64bit)
             cache-name: windows-debug-template-mono-64bit
             target: template_debug
             sconsflags: module_mono_enabled=yes arch=x86_64  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
+            d3d12: true
 
           - name: Template (64bit)
             cache-name: windows-debug-template-64bit
             target: template_debug
             sconsflags: arch=x86_64 ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
+            d3d12: true
 
           - name: Template w/ Mono (32bit)
             cache-name: windows-template-mono-32bit
             target: template_release
             sconsflags: module_mono_enabled=yes arch=x86_32  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
+            d3d12: true
 
           - name: Template (32bit)
             cache-name: windows-template-32bit
             target: template_release
             sconsflags: arch=x86_32  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
+            d3d12: true
 
           - name: Template w/ Mono (32bit)
             cache-name: windows-debug-template-mono-32bit
             target: template_debug
             sconsflags: module_mono_enabled=yes arch=x86_32  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
+            d3d12: true
 
           - name: Template (32bit)
             cache-name: windows-debug-template-32bit
             target: template_debug
             sconsflags: arch=x86_32 ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
+            d3d12: true
 
           - name: Template w/ Mono (arm64)
             cache-name: windows-template-mono-arm64
             target: template_release
             sconsflags: module_mono_enabled=yes arch=arm64 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }} lto=none
             mono: true
             arm: true
+            d3d12: true
 
           - name: Template (arm64)
             cache-name: windows-template-arm64
             target: template_release
             sconsflags: arch=arm64 use_llvm=yes  ${{ github.event.client_payload.production && 'production=yes' || '' }} lto=none
             mono: false
             arm: true
+            d3d12: true
 
           - name: Template w/ Mono (arm64)
             cache-name: windows-debug-template-mono-arm64
             target: template_debug
             sconsflags: module_mono_enabled=yes arch=arm64 use_llvm=yes  ${{ github.event.client_payload.production && 'production=yes' || '' }} lto=none
             mono: true
             arm: true
+            d3d12: true
 
           - name: Template (arm64)
             cache-name: windows-debug-template-arm64
             target: template_debug
             sconsflags: arch=arm64 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }} lto=none
             mono: false
             arm: true
+            d3d12: true
 
           - name: Template w/ Mono (arm32)
             cache-name: windows-template-mono-arm32
             target: template_release
             sconsflags: module_mono_enabled=yes arch=arm32 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }} lto=none
             mono: true
             arm: true
+            d3d12: false
 
           - name: Template (arm32)
             cache-name: windows-template-arm32
             target: template_release
             sconsflags: arch=arm32 use_llvm=yes  ${{ github.event.client_payload.production && 'production=yes' || '' }} lto=none
             mono: false
             arm: true
+            d3d12: false
 
           - name: Template w/ Mono (arm32)
             cache-name: windows-debug-template-mono-arm32
             target: template_debug
             sconsflags: module_mono_enabled=yes arch=arm32 use_llvm=yes  ${{ github.event.client_payload.production && 'production=yes' || '' }} lto=none
             mono: true
             arm: true
+            d3d12: false
 
           - name: Template (arm32)
             cache-name: windows-debug-template-arm32
             target: template_debug
             sconsflags: arch=arm32 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }} lto=none
             mono: false
             arm: true
+            d3d12: false
 
 
     steps:
@@ -730,25 +753,20 @@ jobs:
           rm -rf temp_extract monoglue.tar.gz
 
       - name: Download Direct3D 12 SDK components
+        if: matrix.d3d12
         run: |
           python ./misc/scripts/install_d3d12_sdk_windows.py
 
       - name: Download ANGLE Libraries
         uses: ./.github/actions/download-angle-action
         with:
           angle_url_base: "https://github.com/godotengine/godot-angle-static/releases/download/chromium%2F6601.2/godot-angle-static"
-          angle_folder: "${{ github.workspace }}/deps/angle"
-
-      - name: Download Mesa Libraries
-        uses: ./.github/actions/download-mesa-action
-        with:
-          mesa_url_base: "https://github.com/godotengine/godot-nir-static/releases/download/23.1.9-1/godot-nir-static"
-          mesa_folder: "${{ github.workspace }}/deps/mesa"
+          angle_folder: "${{ github.workspace }}/deps/angle"  
 
       - name: Compilation
         uses: ./.github/actions/godot-build
         with:
-          sconsflags: ${{ matrix.sconsflags }} ${{ env.SCONSFLAGS }}
+          sconsflags: ${{ matrix.sconsflags }} ${{ matrix.d3d12 && env.D3D12FLAGS || '' }} ${{ env.SCONSFLAGS }}
           platform: windows
           target: ${{ matrix.target }}
           mingw-prefix: ${{ matrix.mingw || '' }}
@@ -772,6 +790,10 @@ jobs:
           source: ${{ matrix.cache-name }}-${{ github.event.client_payload.type || 'nightly' }}.tar.gz
           out_dir: ${{ env.DEPLOY_TYPE }}/${{ github.event.client_payload.type || 'nightly' }}${{ startsWith(matrix.target, 'template_') && '/template' || '' }}
 
+      - name: Clean D3D12 deps
+        if: matrix.d3d12
+        run: |
+          rm -rf "${{ github.workspace }}/bin/build_deps"
 
       - name: Upload artifact
         uses: ./.github/actions/upload-artifact