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

Separate native-only feature for wgpu::CommandEncoder::write_timestamp #5188

Merged
merged 10 commits into from
Feb 13, 2024

Conversation

Wumpf
Copy link
Member

@Wumpf Wumpf commented Feb 2, 2024

Connections

Description
WebGPU no longer supports timestamps on encoder (the only kind supported now are the ones on render/compute passes), meaning we have to split up out TIMESTAMP_QUERY_INSIDE_ENCODERS of the existing TIMESTAMP_QUERY feature.

Note that this gets our feature number at 64, meaning I had to switch the feature flag datatype to u128 (.. this will solve the problem once and for all! ;))

Testing

There's a test on timestamp that I ran on Mac. Change overall fairly straight forward, low risk.

Checklist

  • Run cargo fmt.
  • 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 requested a review from a team as a code owner February 2, 2024 15:51
@ErichDonGubler ErichDonGubler self-requested a review February 5, 2024 15:56
@ErichDonGubler ErichDonGubler self-assigned this Feb 5, 2024
@ErichDonGubler

This comment was marked as resolved.

@ErichDonGubler ErichDonGubler changed the title Separate natige-only feature for wgpu::CommandEncoder::write_timestamp Separate native-only feature for wgpu::CommandEncoder::write_timestamp Feb 5, 2024
@Wumpf

This comment was marked as resolved.

Copy link
Member

@ErichDonGubler ErichDonGubler left a comment

Choose a reason for hiding this comment

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

Approving, conditional on style feedback being addressed and resolution of CI issues. I'm not concerned about the rest of the PR. Oh, except:

  • Can we please file follow-up work to investigate switching InstanceFlags to enumset, per discussion in Matrix noting that u128 can be problem for web* backends?

examples/src/mipmap/mod.rs Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@ErichDonGubler

This comment was marked as resolved.

@Wumpf Wumpf force-pushed the timestamp-in-encoders-feature branch from 0a4a214 to 00312e9 Compare February 13, 2024 09:25
@Wumpf Wumpf enabled auto-merge (squash) February 13, 2024 09:25
@Wumpf
Copy link
Member Author

Wumpf commented Feb 13, 2024

oops, messed up a feature check. But luckily the test prevent that from going in, phew

@Wumpf Wumpf force-pushed the timestamp-in-encoders-feature branch from bc349b3 to 27d013e Compare February 13, 2024 15:45
@Wumpf Wumpf merged commit f350f28 into gfx-rs:trunk Feb 13, 2024
27 checks passed
@Wumpf Wumpf deleted the timestamp-in-encoders-feature branch February 13, 2024 18: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.

2 participants