a

fornwall · Aug 21, 2023 · bb43bfd · bb43bfd
1 parent 9526372
commit bb43bfd
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 18 deletions.
diff --git a/src/back/glsl/mod.rs b/src/back/glsl/mod.rs
@@ -630,13 +630,13 @@ impl<'a, W: Write> Writer<'a, W> {
                 self.out,
                 "struct {FREXP_STRUCT} {{
     float fract;
-    float exp;
+    int exp;
 }};
 
 {FREXP_STRUCT} {FREXP_FUNCTION}(float arg) {{
-    float exp;
-    float fract = modf(arg, exp);
-    return {MODF_STRUCT}(fract, exp);
+    int exp;
+    float fract = frexp(arg, exp);
+    return {FREXP_STRUCT}(fract, exp);
 }}"
             )?;
         }
@@ -3039,7 +3039,7 @@ impl<'a, W: Write> Writer<'a, W> {
                     Mf::Fract => "fract",
                     Mf::Trunc => "trunc",
                     Mf::Modf => MODF_FUNCTION,
-                    Mf::Frexp => "frexp",
+                    Mf::Frexp => FREXP_FUNCTION,
                     Mf::Ldexp => "ldexp",
                     // exponent
                     Mf::Exp => "exp",

diff --git a/src/back/hlsl/help.rs b/src/back/hlsl/help.rs
@@ -789,12 +789,12 @@ impl<'a, W: Write> super::Writer<'a, W> {
                 self.out,
                 "struct {struct_name} {{
     float fract;
-    float exp;
+    int exp;
 }};
 
 {struct_name} {function_name}(in float arg) {{
     float exp;
-    float fract = modf(arg, exp);
+    float fract = frexp(arg, exp);
     {struct_name} result;
     result.exp = exp;
     result.fract = fract;

diff --git a/src/back/msl/writer.rs b/src/back/msl/writer.rs
@@ -2168,9 +2168,19 @@ impl<W: Write> Writer<W> {
                             write!(self.out, ".{}", back::COMPONENTS[index as usize])?;
                         }
                     }
-                    crate::TypeInner::ModfResult => {
+                    crate::TypeInner::FrexpResult | crate::TypeInner::ModfResult => {
                         self.put_access_chain(base, policy, context)?;
-                        write!(self.out, ".{}", if index == 0 { "fract" } else { "whole" })?;
+                        write!(
+                            self.out,
+                            ".{}",
+                            if index == 0 {
+                                "fract"
+                            } else if *base_ty == crate::TypeInner::FrexpResult {
+                                "exp"
+                            } else {
+                                "whole"
+                            }
+                        )?;
                     }
                     _ => {
                         self.put_subscripted_access_chain(
@@ -3276,6 +3286,23 @@ impl<W: Write> Writer<W> {
             }
         }
 
+        if module.special_types.frexp_result.is_some() {
+            writeln!(
+                self.out,
+                "
+struct {FREXP_STRUCT} {{
+    float fract;
+    int exp;
+}};
+
+struct {FREXP_STRUCT} {FREXP_FUNCTION}(float arg) {{
+    int exp;
+    float fract = {NAMESPACE}::frexp(arg, exp);
+    return {FREXP_STRUCT}{{ fract, exp }};
+}};"
+            )?;
+        }
+
         if module.special_types.modf_result.is_some() {
             writeln!(
                 self.out,

diff --git a/src/proc/typifier.rs b/src/proc/typifier.rs
@@ -391,14 +391,22 @@ impl<'a> ResolveContext<'a> {
                             }
                         }
                         Ti::BindingArray { base, .. } => Ti::Pointer { base, space },
-                        Ti::FrexpResult | Ti::ModfResult if (0..=1).contains(&index) => {
-                            Ti::ValuePointer {
-                                size: None,
-                                kind: crate::ScalarKind::Float,
-                                width: 4,
-                                space,
-                            }
-                        }
+                        Ti::FrexpResult if (0..=1).contains(&index) => Ti::ValuePointer {
+                            size: None,
+                            kind: if index == 0 {
+                                crate::ScalarKind::Float
+                            } else {
+                                crate::ScalarKind::Sint
+                            },
+                            width: 4,
+                            space,
+                        },
+                        Ti::ModfResult if (0..=1).contains(&index) => Ti::ValuePointer {
+                            size: None,
+                            kind: crate::ScalarKind::Float,
+                            width: 4,
+                            space,
+                        },
                         ref other => {
                             log::error!("Access index sub-type {:?}", other);
                             return Err(ResolveError::InvalidSubAccess {
@@ -408,7 +416,17 @@ impl<'a> ResolveContext<'a> {
                         }
                     }),
                     Ti::BindingArray { base, .. } => TypeResolution::Handle(base),
-                    Ti::FrexpResult | Ti::ModfResult if (0..=1).contains(&index) => {
+                    Ti::FrexpResult if (0..=1).contains(&index) => {
+                        TypeResolution::Value(Ti::Scalar {
+                            kind: if index == 0 {
+                                crate::ScalarKind::Float
+                            } else {
+                                crate::ScalarKind::Sint
+                            },
+                            width: 4,
+                        })
+                    }
+                    Ti::ModfResult if (0..=1).contains(&index) => {
                         TypeResolution::Value(Ti::Scalar {
                             kind: crate::ScalarKind::Float,
                             width: 4,