glsl-in: fix composite constructors #1631
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In the recent rework of the constructors it seems that the logic for composite types (arrays and structs) was accidentally removed by me.
kvark
reviewed
Dec 28, 2021
| @@ -891,7 +891,7 @@ impl Context { | |||
|
|
|||
| pub fn expr_power( | |||
| &mut self, | |||
| parser: &mut Parser, | |||
| parser: &Parser, | |||
| @@ -535,6 +560,26 @@ impl Parser { | |||
| TypeInner::Vector { size, kind, width } => { | |||
| return self.vector_constructor(ctx, body, ty, size, kind, width, &args, meta) | |||
| } | |||
| TypeInner::Array { base, .. } => { | |||
| for (mut arg, meta) in args.iter().copied() { | |||
| let scalar_components = scalar_components(&self.module.types[base].inner); | |||
There was a problem hiding this comment.
would it be easier to do this via
impl crate::TypeInner {
fn scalar_components(&self) -> ... {... }
}There was a problem hiding this comment.
It would be almost the same thing, I have no preference so if you prefer the method call instead of a function call that's fine by me.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the recent rework of the constructors it seems that the logic for
composite types (arrays and structs) was accidentally removed by me.
This PR reimplements it, adds implicit conversions that were missing on them and adds tests.
Closes #1623