github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[naga hlsl-out] Use Scalar associated constants in patterns.

Browse Source
This commit is contained in:
Jim Blandy
2025-02-11 17:22:49 -08:00
parent 6cf4b710b8
commit a25098f5ec
2 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
naga/src/back/hlsl/help.rs
View File

@@ -1128,10 +1128,7 @@ impl<W: Write> super::Writer<'_, W> {
crate::MathFunction::Abs
if matches!(
func_ctx.resolve_type(arg, &module.types).scalar(),
Some(crate::Scalar {
kind: ScalarKind::Sint,
width: 4,
})
Some(crate::Scalar::I32)
) =>
{
let arg_ty = func_ctx.resolve_type(arg, &module.types);
@@ -1186,13 +1183,7 @@ impl<W: Write> super::Writer<'_, W> {
};
match (op, scalar) {
(
crate::UnaryOperator::Negate,
crate::Scalar {
kind: ScalarKind::Sint,
width: 4,
},
) => {
(crate::UnaryOperator::Negate, crate::Scalar::I32) => {
if !self.wrapped.unary_op.insert(wrapped) {
continue;
}

27
naga/src/back/hlsl/writer.rs
View File

@@ -2775,10 +2775,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
right,
} if matches!(
func_ctx.resolve_type(expr, &module.types).scalar(),
Some(Scalar {
kind: ScalarKind::Sint,
width: 4
})
Some(Scalar::I32)
) =>
{
write!(self.out, "asint(asuint(",)?;
@@ -3338,10 +3335,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
let op_str = match op {
crate::UnaryOperator::Negate => {
match func_ctx.resolve_type(expr, &module.types).scalar() {
Some(Scalar {
kind: ScalarKind::Sint,
width: 4,
}) => NEG_FUNCTION,
Some(Scalar::I32) => NEG_FUNCTION,
_ => "-",
}
}
@@ -3444,10 +3438,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
let fun = match fun {
// comparison
Mf::Abs => match func_ctx.resolve_type(arg, &module.types).scalar() {
Some(Scalar {
kind: ScalarKind::Sint,
width: 4,
}) => Function::Regular(ABS_FUNCTION),
Some(Scalar::I32) => Function::Regular(ABS_FUNCTION),
_ => Function::Regular("abs"),
},
Mf::Min => Function::Regular("min"),
@@ -3735,11 +3726,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
// as non-32bit types are DXC only.
Function::MissingIntOverload(fun_name) => {
let scalar_kind = func_ctx.resolve_type(arg, &module.types).scalar();
if let Some(Scalar {
kind: ScalarKind::Sint,
width: 4,
}) = scalar_kind
{
if let Some(Scalar::I32) = scalar_kind {
write!(self.out, "asint({fun_name}(asuint(")?;
self.write_expr(module, arg, func_ctx)?;
write!(self.out, ")))")?;
@@ -3753,11 +3740,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
// as non-32bit types are DXC only.
Function::MissingIntReturnType(fun_name) => {
let scalar_kind = func_ctx.resolve_type(arg, &module.types).scalar();
if let Some(Scalar {
kind: ScalarKind::Sint,
width: 4,
}) = scalar_kind
{
if let Some(Scalar::I32) = scalar_kind {
write!(self.out, "asint({fun_name}(")?;
self.write_expr(module, arg, func_ctx)?;
write!(self.out, "))")?;