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

Make Gilrs a normal resource on non-Wasm targets #12092

Merged
merged 9 commits into from
Feb 26, 2024

Conversation

james7132
Copy link
Member

@james7132 james7132 commented Feb 24, 2024

Objective

Partially address #888. Gilrs is initialized on a separate thread, and thus conditionally implements Send, and all platforms other than Wasm. This means the NonSend resource constraint is likely too conservative.

Solution

Relax the requirement, and conditionally derive Resource on a wrapper around it, using SyncCell to satisfy the Sync requirement on it.

@james7132 james7132 added the A-Input Player input via keyboard, mouse, gamepad, and more label Feb 24, 2024
@alice-i-cecile alice-i-cecile added C-Code-Quality A section of code that is hard to understand or change O-Web Specific to web (WASM) builds labels Feb 25, 2024
Copy link
Contributor

@MiniaczQ MiniaczQ left a comment

Choose a reason for hiding this comment

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

This may need to be reverted with #9122

@alice-i-cecile alice-i-cecile added the S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it label Feb 25, 2024
@alice-i-cecile
Copy link
Member

@james7132 CI failure looks real: broken import on WASM builds.

@alice-i-cecile alice-i-cecile added this pull request to the merge queue Feb 25, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 25, 2024
@james7132 james7132 enabled auto-merge February 25, 2024 23:19
@james7132 james7132 added this pull request to the merge queue Feb 26, 2024
Merged via the queue into bevyengine:main with commit 3a1b9b9 Feb 26, 2024
24 checks passed
msvbg pushed a commit to msvbg/bevy that referenced this pull request Feb 26, 2024
# Objective
Partially address bevyengine#888. Gilrs is initialized on a separate thread, and
thus conditionally implements `Send`, and all platforms other than Wasm.
This means the `NonSend` resource constraint is likely too conservative.

## Solution
Relax the requirement, and conditionally derive Resource on a wrapper
around it, using `SyncCell` to satisfy the `Sync` requirement on it.
msvbg pushed a commit to msvbg/bevy that referenced this pull request Feb 26, 2024
# Objective
Partially address bevyengine#888. Gilrs is initialized on a separate thread, and
thus conditionally implements `Send`, and all platforms other than Wasm.
This means the `NonSend` resource constraint is likely too conservative.

## Solution
Relax the requirement, and conditionally derive Resource on a wrapper
around it, using `SyncCell` to satisfy the `Sync` requirement on it.
@james7132 james7132 deleted the send-gilrs branch March 10, 2024 07:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Input Player input via keyboard, mouse, gamepad, and more C-Code-Quality A section of code that is hard to understand or change O-Web Specific to web (WASM) builds S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants