Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix filtering out dx12 software adapters #6843

Merged
merged 2 commits into from
Jan 2, 2025

Conversation

Wumpf
Copy link
Member

@Wumpf Wumpf commented Jan 2, 2025

Connections

Description

The piece of code that broke is a filter for software rasterizer that incorrectly advertised themselves as integrated GPUs.

Ci was still fine because according to the comment on headless machines we get both a "real" and a "fake" software rasterizers. Due to this bug we'd pick the "fake" one and still run fine, but we want the "real" software rasterizer in actuality.

For reference: this was the original change introducing the filter in the first place

See the original change here:
https://github.com/gfx-rs/wgpu/pull/4259/files#diff-3da333eee10e8a957c04876a1a798ec4047053e7f33bb87b4fabbe2591a8e969R26
if desc.VendorId == 5140 && (desc.Flags & dxgi::DXGI_ADAPTER_FLAG_SOFTWARE) == 0 {

(checks that software flag is NOT set)

Testing

Ran cargo run -p wgpu-info: Before no WARP, after have WARP

Caveat: wgpu-info is actually broken atm! It doesn't build with dx12, had to patch that in and then remove static-dxc again due to a linker issue. Out of scope for this PR though.
Started a fix here #6844

Checklist

  • Run cargo fmt.
  • Run taplo format.
  • Run cargo clippy. If applicable, add:
    • --target wasm32-unknown-unknown
    • --target wasm32-unknown-emscripten
  • Run cargo xtask test to run tests.
  • Add change to CHANGELOG.md. See simple instructions inside file.

@Wumpf Wumpf force-pushed the fix-not-enumerating-warp branch from d18d282 to c6a87b6 Compare January 2, 2025 18:52
Copy link
Member

@cwfitzgerald cwfitzgerald left a comment

Choose a reason for hiding this comment

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

Big Oops

@cwfitzgerald cwfitzgerald merged commit c46624f into gfx-rs:trunk Jan 2, 2025
27 checks passed
@Wumpf Wumpf deleted the fix-not-enumerating-warp branch January 3, 2025 08:45
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.

2 participants