Skip to content

Conversation

@Rutpiv
Copy link
Contributor

@Rutpiv Rutpiv commented Jul 25, 2025

Testing the changes

  • I tested the changes in this PR: briefly

Local build testing

  • I built this PR locally for my native architecture, (x86_64-glibc)
  • I built this PR locally for these architectures using specific masterdirs:
    • x86_64-musl
    • i686
  • I built this PR locally for these architectures (crossbuilds):
    • aarch64
    • aarch64-musl
    • armv7l
    • armv7l-musl
    • armv6l
    • armv6l-musl

Due to the issue I caused with the FLAC merge (#54573), I made sure to be extra careful with this new large merge. I have built all affected packages on all the architectures listed above, and I have tested the software in my daily usage using the RADV driver. Everything appears to be working correctly.

@Rutpiv Rutpiv changed the title Spirv vulkan Vulkan/SPIR-V packages update to 1.4.321.0. Jul 25, 2025
@Rutpiv Rutpiv marked this pull request as draft August 1, 2025 18:23
@Rutpiv Rutpiv marked this pull request as ready for review August 1, 2025 18:26
@Rutpiv Rutpiv marked this pull request as draft August 18, 2025 23:35
@Rutpiv
Copy link
Contributor Author

Rutpiv commented Aug 18, 2025

After rebasing to master, the vulkan-tools package no longer compiles.
I’m currently investigating the issue to identify the cause and potential fix.

@Rutpiv Rutpiv force-pushed the spirv-vulkan branch 2 times, most recently from d52f620 to a88378a Compare September 1, 2025 01:32
@Rutpiv
Copy link
Contributor Author

Rutpiv commented Sep 1, 2025

The Vulkan-Loader seems to be causing conflicts with the Blender package in the CI.
The Vulkan-Tools build, specifically vkcube, now passes with this patch, which backports a commit from an upstream PR that has already been merged.
This patch fixes the vkcube build, which appears to have broken due to a recent CMake update.
In the future, this patch should be removed once the upstream changes are included in a release.

@Rutpiv Rutpiv force-pushed the spirv-vulkan branch 2 times, most recently from b85c0d5 to fc13162 Compare September 12, 2025 17:37
@Rutpiv Rutpiv force-pushed the spirv-vulkan branch 2 times, most recently from c43e819 to 4302391 Compare September 22, 2025 02:37
@Rutpiv
Copy link
Contributor Author

Rutpiv commented Sep 22, 2025

The latest releases of SPIRV-LLVM-Translator 18 and 19 are currently failing to build due to compilation errors. For this reason, I kept the previous version, which is building and working correctly.

@Rutpiv Rutpiv marked this pull request as ready for review September 22, 2025 02:59
@Rutpiv Rutpiv marked this pull request as draft October 3, 2025 00:46
@Rutpiv Rutpiv force-pushed the spirv-vulkan branch 2 times, most recently from f9253a1 to ea099c9 Compare October 3, 2025 15:24
@Rutpiv
Copy link
Contributor Author

Rutpiv commented Oct 3, 2025

I’ve now included the glslang, shaderc, and SPIRV-Tools packages. The next step is to check which packages will need an revbump due to the SONAME change in glslang.

Currently, SPIRV-Tools is kept at an older version for the same reason I mentioned earlier regarding the SPIRV-LLVM-Translator 18 and 19 builds failing with compilation errors. For this reason, I kept the previous version, which builds and works correctly. The issue might be related to LLVM, but I’m not entirely sure yet.

@Rutpiv Rutpiv changed the title Vulkan/SPIR-V packages update to 1.4.321.0. Vulkan/SPIR-V packages update to 1.4.321.0; glslang: update to 16.0.0; shaderc: update to 2025.4. Oct 3, 2025
@Rutpiv Rutpiv mentioned this pull request Nov 9, 2025
@Rutpiv
Copy link
Contributor Author

Rutpiv commented Nov 9, 2025

Currently waiting for the LLVM 21 builds to finish on the following architectures:

  • armv7l
  • armv7l-musl
  • armv6l
  • armv6l-musl

Because of that, I'm temporarily blocking the build until all related changes are fully compiled and verified locally.

@Rutpiv Rutpiv changed the title Vulkan/SPIR-V packages update to 1.4.321.0; glslang: update to 16.0.0; shaderc: update to 2025.4. Vulkan/SPIR-V: update to 1.4.328.1; glslang 16.0.0; revbump shaderc, godot. Nov 9, 2025
@Rutpiv Rutpiv marked this pull request as ready for review November 13, 2025 20:23
@Rutpiv
Copy link
Contributor Author

Rutpiv commented Nov 13, 2025

Everything seems to be working well with the updated Vulkan and SPIR V stack.
Local builds succeeded and the packages behave as expected during testing.

Godot also seems to be working correctly with the updated stack, and the engine behaved as expected during local testing.

I will continue monitoring for any issues, but so far the update looks stable.

@Rutpiv Rutpiv changed the title Vulkan/SPIR-V: update to 1.4.328.1; glslang 16.0.0; revbump shaderc, godot. Vulkan: update to 1.4.328.1; glslang 16.0.0; revbump shaderc, godot. Nov 28, 2025
@Rutpiv
Copy link
Contributor Author

Rutpiv commented Dec 10, 2025

I checked the glslang changes and it looks like libSPIRV.so is now libSPIRV.so.16, so I updated the reference accordingly.
While at it, I bumped glslang to 16.1.0 and shaderc to 2025.5.
I rebuilt godot with these updates, and everything compiled without any issues.

@Rutpiv Rutpiv changed the title Vulkan: update to 1.4.328.1; glslang 16.0.0; revbump shaderc, godot. Vulkan: update to 1.4.328.1; glslang 16.1.0; revbump shaderc, godot. Dec 10, 2025
@Rutpiv Rutpiv force-pushed the spirv-vulkan branch 3 times, most recently from 1adc7d4 to 5f0f9ae Compare December 16, 2025 04:04
@Rutpiv Rutpiv changed the title Vulkan: update to 1.4.328.1; glslang 16.1.0; revbump shaderc, godot. Vulkan/SPIR-V: update to 1.4.335.0; glslang 16.1.0; revbump shaderc, godot. Dec 16, 2025
@zen0bit
Copy link
Contributor

zen0bit commented Dec 22, 2025

Take a look at my godot PR
that should solve your failing build

Also added godoot subpackage
Maybe update your PR also with my changes?

@Rutpiv
Copy link
Contributor Author

Rutpiv commented Dec 22, 2025

Thanks a lot for jumping in and fixing that, really appreciated.

I had never worked with packages that explicitly conflict with each other before, so the SPIRV-LLVM-Translator 19/21 issue caught me off guard. Your fix made things much clearer.

I’ve already merged your changes into my PR, and I also added you as a co-author for the SPIRV-LLVM-Translator packages, since your contribution there was essential.

I also just added the recently updated SPIRV-Tools to the stack. I forgot to mention earlier, but I’ve updated the Vulkan packages as well, now targeting version 1.4.335.0, so everything in the Vulkan/SPIR-V stack should be aligned.

Thanks again for the help, especially with the Godot subpackage and CI fixes.

@ahesford
Copy link
Member

Reconcile with #58117.

@ahesford ahesford marked this pull request as draft December 30, 2025 17:42
@Rutpiv
Copy link
Contributor Author

Rutpiv commented Dec 30, 2025

Thanks for the clarification, that’s fair.

To give some context: the work originally started in the Vulkan/SPIR-V PR, where I was gradually updating and adapting the stack over time. When @zen0bit opened his PR focused on updating and adopting the Godot package, I suggested aligning the work to avoid rebuilding the same versions twice in the future, especially since a revbump was already inevitable due to the glslang update.

During that process, the Godot changes were tested on top of my existing PR. While doing so, @zen0bit proposed and added the new Godot export templates subpackage and helped resolve the CI issues I was hitting related to the SPIRV-LLVM-Translator 19/21 conflict, which I had not dealt with before. Those changes have since been merged into my PR, and he’s credited as a co-author for the SPIRV-LLVM-Translator packages.

Since then, I’ve also updated SPIRV-Tools (which is not covered by the other PR), so this PR currently reflects the most up-to-date and consistent state of the Vulkan/SPIR-V stack.

That said, I agree that we should avoid duplicating effort. If @zen0bit is okay with it, we can align on moving forward with a single PR, or adopt another approach that he and the maintainers consider more appropriate.

Happy to reconcile this in whichever way is preferred.

@Rutpiv
Copy link
Contributor Author

Rutpiv commented Jan 4, 2026

Following up on this, to keep scopes clear and reviews straightforward, I’ll proceed by keeping each change in its own PR rather than continuing with a combined approach.

This PR will focus strictly on the Vulkan/SPIR-V stack updates. The Godot changes can move back to their dedicated PR, as the stack updates do not affect it directly, except for the glslang SONAME change.

Thanks for the guidance.

@Rutpiv Rutpiv marked this pull request as ready for review January 4, 2026 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants