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

[Merged by Bors] - Update vendored Crevice to 0.8.0 + PR for arrays #3059

Closed

Conversation

mockersf
Copy link
Member

@mockersf mockersf commented Nov 2, 2021

Objective

Solution

  • Also updated glam and hexasphere to only have one version of glam
  • From the original PR, using crevice to write GLSL code containing arrays would probably not work but it's not something used by Bevy

@@ -108,7 +108,7 @@ ron = "0.6.2"
serde = { version = "1", features = ["derive"] }
# Needed to poll Task examples
futures-lite = "1.11.3"
crevice = {path = "crates/crevice"}
crevice = { path = "crates/crevice", version = "0.8.0", features = ["glam"] }
Copy link
Contributor

Choose a reason for hiding this comment

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

Specifying a version here will make cargo use the non-vendored version when publishing.

Copy link
Member Author

Choose a reason for hiding this comment

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

There are 3 dependencies on crevice in Bevy crates, it was the only one not specifying a version so I added it for consistency.

Before Bevy release, Cart will also have to rename it to "bevy_crevice" or something

Copy link
Contributor

Choose a reason for hiding this comment

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

That depends whether we even need to vendor it anymore. I think we should at least try it from crates.io after the recent rewrite and see if it fits our needs or not.

Copy link
Member Author

@mockersf mockersf Nov 2, 2021

Choose a reason for hiding this comment

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

I tried, it's missing the array PR. once that's merged and released we wouldn't need to vendor it

Copy link
Contributor

Choose a reason for hiding this comment

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

Perfect! :)

@alice-i-cecile alice-i-cecile added C-Dependencies A change to the crates that Bevy depends on S-Needs-Review labels Nov 5, 2021
@cart
Copy link
Member

cart commented Nov 12, 2021

bors r+

bors bot pushed a commit that referenced this pull request Nov 12, 2021
# Objective

- Update vendor crevice to have the latest update from crevice 0.8.0
- Using https://github.com/ElectronicRU/crevice/tree/arrays which has the changes to make arrays work

## Solution

- Also updated glam and hexasphere to only have one version of glam
- From the original PR, using crevice to write GLSL code containing arrays would probably not work but it's not something used by Bevy
@bors
Copy link
Contributor

bors bot commented Nov 12, 2021

@bors bors bot changed the title Update vendored Crevice to 0.8.0 + PR for arrays [Merged by Bors] - Update vendored Crevice to 0.8.0 + PR for arrays Nov 12, 2021
@bors bors bot closed this Nov 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-Dependencies A change to the crates that Bevy depends on
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants