Skip to content

Comments

vulkan-sdk: 1.3.239 -> 1.3.243#224485

Merged
Kranzes merged 11 commits intoNixOS:stagingfrom
PedroHLC:vulkan-sdk-1.3.243-master
Apr 4, 2023
Merged

vulkan-sdk: 1.3.239 -> 1.3.243#224485
Kranzes merged 11 commits intoNixOS:stagingfrom
PedroHLC:vulkan-sdk-1.3.243-master

Conversation

@PedroHLC
Copy link
Member

@PedroHLC PedroHLC commented Apr 3, 2023

Description of changes
Things done

On an x86_64-linux: Tested building vulkan-tools, which built vulkan-headers, vulkan-loader, spirv-headers, spirv-tools and glslang. Building vulkan-tools-lunarg builds vulkan-validation-layers. I've built vulkan-extension-layer, then spirv-cross and finished by running vkcube-wayland.

I didn't test the moltenvk update (Cc @reckenrode).

@ofborg ofborg bot requested a review from Flakebi April 3, 2023 16:39
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Apr 3, 2023
@Kranzes
Copy link
Member

Kranzes commented Apr 3, 2023

Do you have a script that updates all of these at once?

@PedroHLC
Copy link
Member Author

PedroHLC commented Apr 3, 2023

Do you have a script that updates all of these at once?

Nope, are you considering writing one?

Copy link
Contributor

@Ralith Ralith left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Wouldn't mind seeing shaderc 2023.3 in here as well, but not a blocker.

@PedroHLC PedroHLC added the 12.approvals: 1 This PR was reviewed and approved by one person. label Apr 3, 2023
@Kranzes
Copy link
Member

Kranzes commented Apr 3, 2023

Do you have a script that updates all of these at once?

Nope, are you considering writing one?

I wasn't planning but I did end up writing one, check this out: https://github.com/Kranzes/nixpkgs/tree/vulkan-sdk-update-script

Tell me if you would like me to create a PR.

@PedroHLC
Copy link
Member Author

PedroHLC commented Apr 4, 2023

Tell me if you would like me to create a PR.

You can do it, but my suggestions:

  1. Don't push the version bumps, only the script. This way you can target master directly;
  2. Instead of removing the version assertions, move them to meta.broken (e.g.: broken = version != spirv-headers.version;);
  3. Add the script to vulkan-header's passthru.updateScript. Since it's the core of the version assertions;
  4. Any other review/suggestion related to the script, we can do on said PR/draft to avoid delaying this PR though staging interactions.

@reckenrode
Copy link
Contributor

Did some testing of MoltenVK this morning on Darwin. The changes LGTM.

@PedroHLC PedroHLC added the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. label Apr 4, 2023
@Kranzes Kranzes merged commit 244eeef into NixOS:staging Apr 4, 2023
@PedroHLC PedroHLC deleted the vulkan-sdk-1.3.243-master branch April 4, 2023 20:33
@trofi
Copy link
Contributor

trofi commented Apr 5, 2023

Bisect says 6cc536e vulkan-headers: 1.3.239.0 -> 1.3.243.0 broke libplacebo (mpv depend) in staging as:

$ nix build --no-link -f. libplacebo -L
...
libplacebo> src/utils_gen.c: In function 'vk_res_str':
libplacebo> src/utils_gen.c:32:10: error: 'VK_ERROR_VALIDATION_FAILED' undeclared (first use in this function); did you mean 'VK_ERROR_VALIDATION_FAILED_EXT'?
libplacebo>    32 |     case VK_ERROR_VALIDATION_FAILED: return "VK_ERROR_VALIDATION_FAILED";
libplacebo>       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~
libplacebo>       |          VK_ERROR_VALIDATION_FAILED_EXT

@Kranzes
Copy link
Member

Kranzes commented Apr 5, 2023

libplacebo seems to be pretty outdated, we could try updating it.

Edit: #224795

@PedroHLC
Copy link
Member Author

PedroHLC commented Apr 5, 2023

Bisect says 6cc536e vulkan-headers: 1.3.239.0 -> 1.3.243.0 broke libplacebo (mpv depend) in staging as:

$ nix build --no-link -f. libplacebo -L
...
libplacebo> src/utils_gen.c: In function 'vk_res_str':
libplacebo> src/utils_gen.c:32:10: error: 'VK_ERROR_VALIDATION_FAILED' undeclared (first use in this function); did you mean 'VK_ERROR_VALIDATION_FAILED_EXT'?
libplacebo>    32 |     case VK_ERROR_VALIDATION_FAILED: return "VK_ERROR_VALIDATION_FAILED";
libplacebo>       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~
libplacebo>       |          VK_ERROR_VALIDATION_FAILED_EXT

Sorry, this is not the first time libplace broke with a vulkan-headers bump, I should have tested it.

@PedroHLC PedroHLC mentioned this pull request Apr 6, 2023
3 tasks
@vcunat
Copy link
Member

vcunat commented Apr 11, 2023

Also mangohud regression looks like caused by this PR: https://hydra.nixos.org/build/215271636
Maintainers: @kira-bruneau, @zeratax

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants