Skip to content

Pointer should have ty: Token<Type> instead of ty: Word #152

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

Merged
merged 1 commit into from
Aug 19, 2020
Merged

Pointer should have ty: Token<Type> instead of ty: Word #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion autogen/sr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ impl OperandTokens {
quote! { StructMember },
quote! { StructMember::new(self.types.lookup_token(*value)) },
),
"Parameter Types" => (
"Parameter Types" | "Type" => (
quote! { Token<Type> },
quote! { self.types.lookup_token(*value) },
),
Expand Down
6 changes: 3 additions & 3 deletions rspirv/lift/autogen_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ impl LiftContext {
}),
6u32 => Ok(ops::Op::MemberName {
ty: (match operands.next() {
Some(&dr::Operand::IdRef(ref value)) => Some(*value),
Some(&dr::Operand::IdRef(ref value)) => Some(self.types.lookup_token(*value)),
Some(_) => Err(OperandError::WrongType)?,
None => None,
})
Expand Down Expand Up @@ -5651,7 +5651,7 @@ impl LiftContext {
}),
5362u32 => Ok(ops::Op::CooperativeMatrixLengthNV {
ty: (match operands.next() {
Some(&dr::Operand::IdRef(ref value)) => Some(*value),
Some(&dr::Operand::IdRef(ref value)) => Some(self.types.lookup_token(*value)),
Some(_) => Err(OperandError::WrongType)?,
None => None,
})
Expand Down Expand Up @@ -8149,7 +8149,7 @@ impl LiftContext {
})
.ok_or(OperandError::Missing)?,
ty: (match operands.next() {
Some(&dr::Operand::IdRef(ref value)) => Some(*value),
Some(&dr::Operand::IdRef(ref value)) => Some(self.types.lookup_token(*value)),
Some(_) => Err(OperandError::WrongType)?,
None => None,
})
Expand Down
4 changes: 2 additions & 2 deletions rspirv/sr/autogen_ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pub enum Op {
name: String,
},
MemberName {
ty: spirv::Word,
ty: Token<Type>,
member: u32,
name: String,
},
Expand Down Expand Up @@ -1494,7 +1494,7 @@ pub enum Op {
c: spirv::Word,
},
CooperativeMatrixLengthNV {
ty: spirv::Word,
ty: Token<Type>,
},
BeginInvocationInterlockEXT,
EndInvocationInterlockEXT,
Expand Down
2 changes: 1 addition & 1 deletion rspirv/sr/autogen_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pub enum Type {
},
Pointer {
storage_class: spirv::StorageClass,
ty: spirv::Word,
ty: Token<Type>,
},
Function {
return_type: Token<Type>,
Expand Down