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

spv-out: use OpFRem instead of OpFMod #1653

Merged
merged 1 commit into from
Jan 8, 2022
Merged

spv-out: use OpFRem instead of OpFMod #1653

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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ bitflags = "1"
bit-set = "0.5"
codespan-reporting = { version = "0.11.0", optional = true }
rustc-hash = "1.1.0"
indexmap = "1.6" # 1.7 has MSRV 1.49
indexmap = "~1.6" # 1.7 has MSRV 1.49
log = "0.4"
num-traits = "0.2"
spirv = { version = "0.2", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion src/back/spv/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ impl<'w> BlockContext<'w> {
crate::BinaryOperator::Modulo => match left_ty_inner.scalar_kind() {
Some(crate::ScalarKind::Sint) => spirv::Op::SMod,
Some(crate::ScalarKind::Uint) => spirv::Op::UMod,
Some(crate::ScalarKind::Float) => spirv::Op::FMod,
Some(crate::ScalarKind::Float) => spirv::Op::FRem,
_ => unimplemented!(),
},
crate::BinaryOperator::Equal => match left_ty_inner.scalar_kind() {
Expand Down
4 changes: 2 additions & 2 deletions tests/out/spv/operators.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,13 @@ OpFunctionEnd
OpBranch %118
%118 = OpLabel
%119 = OpSMod %8 %7 %7
%120 = OpFMod %4 %3 %3
%120 = OpFRem %4 %3 %3
%122 = OpCompositeConstruct %121 %7 %7 %7
%123 = OpCompositeConstruct %121 %7 %7 %7
%124 = OpSMod %121 %122 %123
%125 = OpCompositeConstruct %22 %3 %3 %3
%126 = OpCompositeConstruct %22 %3 %3 %3
%127 = OpFMod %22 %125 %126
%127 = OpFRem %22 %125 %126
OpReturn
OpFunctionEnd
%129 = OpFunction %2 None %117
Expand Down