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.

Sign up for GitHub

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

Jump to bottom

ConstantEvaluator::swizzle: Handle vector concatenation and indexing #2485

Merged
merged 4 commits into from
Sep 20, 2023
Merged

ConstantEvaluator::swizzle: Handle vector concatenation and indexing #2485

merged 4 commits into from
Sep 20, 2023

Conversation

jimblandy
Copy link
Member

No description provided.

@jimblandy jimblandy mentioned this pull request Sep 18, 2023
Merged
@jimblandy jimblandy force-pushed the compose-flattens branch 2 times, most recently from 3eec55a to 4d94474 Compare September 18, 2023 20:06
@jimblandy jimblandy changed the title ConstantEvaluator::swizzle: Handle vector concatenation. ConstantEvaluator::swizzle: Handle vector concatenation and indexing Sep 18, 2023
teoxoy
teoxoy requested changes Sep 19, 2023
View reviewed changes
Copy link
Member

@teoxoy teoxoy left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this! I have one concern.

src/proc/constant_evaluator.rs Outdated Show resolved Hide resolved
@jimblandy
Copy link
Member Author

d2468a1 addresses the two-level nesting, but we run into the OpConstantComposite problem I mentioned in my other review. I'll work on that for a bit.

@jimblandy
Copy link
Member Author

This PR needs to be squashed.

@jimblandy
Copy link
Member Author

But it should be ready for review.

teoxoy
teoxoy approved these changes Sep 20, 2023
View reviewed changes
Copy link
Member

@teoxoy teoxoy left a comment

Choose a reason for hiding this comment

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

Looks great! Thanks for also fixing the SPIR-V backend!

@teoxoy teoxoy merged commit 5dc9693 into gfx-rs:const-expressions-2 Sep 20, 2023
9 checks passed
@jimblandy jimblandy deleted the compose-flattens branch September 20, 2023 18:17
jimblandy added a commit to jimblandy/naga that referenced this pull request Sep 20, 2023
@jimblandy
ConstantEvaluator::swizzle: Handle vector concatenation and indexing (g…
94668cb 
…fx-rs#2485)

* ConstantEvaluator::swizzle: Handle vector concatenation, indexing.

* Handle vector Compose expressions nested two deep.

* Move `flatten_compose` to `proc`, and make it a free function.

* [spv-out] Ensure that we flatten Compose for OpConstantCompose.
jimblandy added a commit that referenced this pull request Sep 20, 2023
@jimblandy
ConstantEvaluator::swizzle: Handle vector concatenation and indexing (#…
7ca5d3f 
…2485)

* ConstantEvaluator::swizzle: Handle vector concatenation, indexing.

* Handle vector Compose expressions nested two deep.

* Move `flatten_compose` to `proc`, and make it a free function.

* [spv-out] Ensure that we flatten Compose for OpConstantCompose.
teoxoy pushed a commit that referenced this pull request Sep 22, 2023
@jimblandy @teoxoy
ConstantEvaluator::swizzle: Handle vector concatenation and indexing (#…
3ca68d6 
…2485)

* ConstantEvaluator::swizzle: Handle vector concatenation, indexing.

* Handle vector Compose expressions nested two deep.

* Move `flatten_compose` to `proc`, and make it a free function.

* [spv-out] Ensure that we flatten Compose for OpConstantCompose.
jimblandy added a commit to jimblandy/naga that referenced this pull request Oct 4, 2023
@jimblandy
ConstantEvaluator::swizzle: Handle vector concatenation and indexing (g…
e44ddfd 
…fx-rs#2485)

* ConstantEvaluator::swizzle: Handle vector concatenation, indexing.

* Handle vector Compose expressions nested two deep.

* Move `flatten_compose` to `proc`, and make it a free function.

* [spv-out] Ensure that we flatten Compose for OpConstantCompose.
teoxoy pushed a commit that referenced this pull request Oct 5, 2023
@jimblandy @teoxoy
ConstantEvaluator::swizzle: Handle vector concatenation and indexing (#…
854444a 
…2485)

* ConstantEvaluator::swizzle: Handle vector concatenation, indexing.

* Handle vector Compose expressions nested two deep.

* Move `flatten_compose` to `proc`, and make it a free function.

* [spv-out] Ensure that we flatten Compose for OpConstantCompose.
jimblandy added a commit that referenced this pull request Oct 7, 2023
@jimblandy
ConstantEvaluator::swizzle: Handle vector concatenation and indexing (#…
2bb3cc1 
…2485)

* ConstantEvaluator::swizzle: Handle vector concatenation, indexing.

* Handle vector Compose expressions nested two deep.

* Move `flatten_compose` to `proc`, and make it a free function.

* [spv-out] Ensure that we flatten Compose for OpConstantCompose.
teoxoy pushed a commit that referenced this pull request Oct 9, 2023
@jimblandy @teoxoy
ConstantEvaluator::swizzle: Handle vector concatenation and indexing (#…
64a6055 
…2485)

* ConstantEvaluator::swizzle: Handle vector concatenation, indexing.

* Handle vector Compose expressions nested two deep.

* Move `flatten_compose` to `proc`, and make it a free function.

* [spv-out] Ensure that we flatten Compose for OpConstantCompose.
teoxoy pushed a commit that referenced this pull request Oct 10, 2023
@jimblandy @teoxoy
ConstantEvaluator::swizzle: Handle vector concatenation and indexing (#…
d53a592 
…2485)

* ConstantEvaluator::swizzle: Handle vector concatenation, indexing.

* Handle vector Compose expressions nested two deep.

* Move `flatten_compose` to `proc`, and make it a free function.

* [spv-out] Ensure that we flatten Compose for OpConstantCompose.
jimblandy added a commit that referenced this pull request Oct 12, 2023
@jimblandy
ConstantEvaluator::swizzle: Handle vector concatenation and indexing (#…
2e5a244 
…2485)

* ConstantEvaluator::swizzle: Handle vector concatenation, indexing.

* Handle vector Compose expressions nested two deep.

* Move `flatten_compose` to `proc`, and make it a free function.

* [spv-out] Ensure that we flatten Compose for OpConstantCompose.
teoxoy pushed a commit that referenced this pull request Oct 12, 2023
@jimblandy @teoxoy
ConstantEvaluator::swizzle: Handle vector concatenation and indexing (#…
1a4b526 
…2485)

* ConstantEvaluator::swizzle: Handle vector concatenation, indexing.

* Handle vector Compose expressions nested two deep.

* Move `flatten_compose` to `proc`, and make it a free function.

* [spv-out] Ensure that we flatten Compose for OpConstantCompose.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@teoxoy teoxoy teoxoy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jimblandy @teoxoy