diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-31 18:57:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-31 18:57:46 +0200 |
| commit | 037f7f70f40237db91b35a3f52bf7b3eb879e6d2 (patch) | |
| tree | afb30b4d24d75234915bdb9f38605804c35b8c1f /.github | |
| parent | 20d46c5b9ede7bfb9001d341ac20d8a30f49cba5 (diff) | |
| parent | e8877806eceb7d4f5ddbe6fef4bef2f58ec3781a (diff) | |
Merge pull request #51091 from qarmin/attempted_to_free
Fix 'Attempted to remove invalid ID' errors
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/linux_builds.yml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index 1b68f66956..679362d749 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -70,12 +70,12 @@ jobs: run: | ./bin/godot.linuxbsd.opt.tools.64 --test - # Download, unzip and setup SwiftShader library [d4550ab8d3f] + # Download, unzip and setup SwiftShader library [4466040] - name: Download SwiftShader run: | - wget https://github.com/qarmin/gtk_library_store/releases/download/3.24.0/swiftshader.zip - unzip swiftshader.zip - rm swiftshader.zip + wget https://github.com/qarmin/gtk_library_store/releases/download/3.24.0/swiftshader2.zip + unzip swiftshader2.zip + rm swiftshader2.zip curr="$(pwd)/libvk_swiftshader.so" sed -i "s|PATH_TO_CHANGE|$curr|" vk_swiftshader_icd.json @@ -144,12 +144,10 @@ jobs: scons --version # We should always be explicit with our flags usage here since it's gonna be sure to always set those flags - # [Workaround] SwiftShader doesn't support tessellation, so we skip Godot check about it - name: Compilation env: SCONS_CACHE: ${{github.workspace}}/.scons_cache/ run: | - sed -i "s|ERR_FAIL_COND_V(p_rasterization_state.patch_control_points|//ERR_FAIL_COND_V(p_rasterization_state.patch_control_points|" drivers/vulkan/rendering_device_vulkan.cpp scons tools=yes tests=yes target=debug debug_symbols=no use_asan=yes use_ubsan=yes ls -l bin/ @@ -158,12 +156,12 @@ jobs: run: | ./bin/godot.linuxbsd.tools.64s --test - # Download, unzip and setup SwiftShader library [d4550ab8d3f] + # Download, unzip and setup SwiftShader library [4466040] - name: Download SwiftShader run: | - wget https://github.com/qarmin/gtk_library_store/releases/download/3.24.0/swiftshader.zip - unzip swiftshader.zip - rm swiftshader.zip + wget https://github.com/qarmin/gtk_library_store/releases/download/3.24.0/swiftshader2.zip + unzip swiftshader2.zip + rm swiftshader2.zip curr="$(pwd)/libvk_swiftshader.so" sed -i "s|PATH_TO_CHANGE|$curr|" vk_swiftshader_icd.json |