Skip to content

Mesa spring cleaning#213158

Merged
K900 merged 14 commits intoNixOS:staging-nextfrom
K900:mesa-spring-cleaning
Jan 29, 2023
Merged

Mesa spring cleaning#213158
K900 merged 14 commits intoNixOS:staging-nextfrom
K900:mesa-spring-cleaning

Conversation

@K900
Copy link
Contributor

@K900 K900 commented Jan 28, 2023 •
edited
Loading

Description of changes

pokes head out of rabbit hole

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@K900 K900 requested review from alyssais and vcunat January 28, 2023 13:24
alyssais
alyssais requested changes Jan 28, 2023
View reviewed changes
Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

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

Great work!

K900 added 7 commits January 28, 2023 16:36
@K900
mesa: add libzstd
678bcd5 
Will be used for shader caches, should make loading them slightly faster.
@K900
mesa: build intel-nullhw Vulkan layer
5074173 
Useful for debugging
@K900
directx-headers: init at 1.608.2
07e13ab
@K900
mesa: enable RT on Intel hardware
17af0cd
@K900
mesa: enable SPIR-V support for Clover
9697801
@K900
mesa: clean up, allow building with dozen
677e5a1
@K900
mesa: reorganize default driver list
e7a2c65 
Upstream doesn't enable lots of things we might actually want
by default, so just specify everything manually.

Each list is grouped into three parts: arch-independent drivers,
aarch64-only drivers and x86_64 only drivers.
@K900 K900 force-pushed the mesa-spring-cleaning branch from 18f8940 to e7a2c65 Compare January 28, 2023 13:36
@ofborg ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package labels Jan 28, 2023
@ofborg ofborg bot requested a review from primeos January 28, 2023 13: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 Jan 28, 2023
@vcunat
Copy link
Member

vcunat commented Jan 28, 2023

aarch64-linux:

FAILED: src/intel/isl/libisl_tiled_memcpy.a.p/isl_tiled_memcpy_normal.c.o 
gcc -Isrc/intel/isl/libisl_tiled_memcpy.a.p -Isrc/intel/isl -I../src/intel/isl -Iinclude -I../include -Isrc -I../src -Isrc/mesa -I../src/mesa -I../src/gallium/include -Isrc/intel -I../src/intel -Isrc/util -I../src/util -I/n>
gcc: error: unrecognized command line option '-msse2'

@vcunat
Copy link
Member

vcunat commented Jan 28, 2023

Succeeded now. (/nix/store/fwp7ydcxr5aawbxng5zr4yyf3zlmcidq-mesa-22.3.4.drv)

@vcunat
Copy link
Member

vcunat commented Jan 28, 2023 •
edited
Loading

Size diff against master for x86_64-linux .drivers: +11M, +61M for the whole closure. One day we might want to split them up and select what's needed based on the NixOS option. But certainly not for this staging-next.

@K900
Copy link
Contributor Author

K900 commented Jan 28, 2023

+11M on aarch64?

@K900 K900 marked this pull request as ready for review January 28, 2023 15:53
@vcunat
Copy link
Member

vcunat commented Jan 28, 2023

Same for aarch64-linux: +39, +89.

alyssais
alyssais approved these changes Jan 28, 2023
View reviewed changes
Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

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

Tested building pkgsCross.riscv64.mesa.

@K900
Copy link
Contributor Author

K900 commented Jan 28, 2023

image

@K900
mesa: add udev dependency
c304f26 
Enables display hotplug events for Vulkan
@K900 K900 force-pushed the mesa-spring-cleaning branch from 0e622b3 to c304f26 Compare January 28, 2023 19:55
@K900 K900 merged commit a0c2a8b into NixOS:staging-next Jan 29, 2023
@PedroHLC PedroHLC mentioned this pull request Jan 29, 2023
Closed
13 tasks
@Atemu Atemu mentioned this pull request Jan 30, 2023
Closed
@alyssais alyssais mentioned this pull request Jan 30, 2023
Merged
13 tasks
@ghost
Copy link

ghost commented Feb 3, 2023

uhm, i think this disabled building 32bit iris? It's no longer in /run/opengl-driver-32/dri/lib

@K900
Copy link
Contributor Author

K900 commented Feb 3, 2023

Oh no. I think it did. The check should probably be isx86, not isx86_64

@ghost
Copy link

ghost commented Feb 3, 2023

yeah, I just realized as now my games run @ less than 10 fps due to using dxvk+llvmpipe

@K900 K900 mentioned this pull request Feb 3, 2023
Merged
13 tasks
@K900 K900 deleted the mesa-spring-cleaning branch July 27, 2025 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alyssais alyssais alyssais approved these changes

@vcunat vcunat Awaiting requested review from vcunat

@primeos primeos Awaiting requested review from primeos

Assignees

No one assigned

Labels

8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@K900 @vcunat @alyssais