Add support for Value property on ref types

krauthaufen · Jan 25, 2024 · 058227d · 058227d
1 parent 5bda0ca
commit 058227d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 19 deletions.
diff --git a/src/Libs/FShade.Imperative/Frontend.fs b/src/Libs/FShade.Imperative/Frontend.fs
@@ -340,34 +340,42 @@ module ExpressionExtensions =
     let private deref = getMethodInfo <@ (!) @>
     let private setref = getMethodInfo <@ (:=) @>
 
+    let (|RefExpr|_|) (e : Expr) =
+        match e.Type with
+        | Ref inner -> Some inner
+        | _ -> None
 
     let (|RefOf|_|) (e : Expr) =
         match e with
-            | Call(None, mi, [v]) when mi.IsGenericMethod && mi.GetGenericMethodDefinition() = refof ->
-                Some v
-            | _ ->
-                None
+        | Call(None, mi, [v]) when mi.IsGenericMethod && mi.GetGenericMethodDefinition() = refof ->
+            Some v
+        | _ ->
+            None
 
     let (|NewRef|_|) (e : Expr) =
         match e with
-            | Call(None, mi, [v]) when mi.IsGenericMethod && mi.GetGenericMethodDefinition() = newref ->
-                Some v
-            | _ ->
-                None
+        | Call(None, mi, [v]) when mi.IsGenericMethod && mi.GetGenericMethodDefinition() = newref ->
+            Some v
+        | _ ->
+            None
 
     let (|DeRef|_|) (e : Expr) =
         match e with
-            | Call(None, mi, [v]) when mi.IsGenericMethod && mi.GetGenericMethodDefinition() = deref ->
-                Some v
-            | _ ->
-                None
+        | Call(None, mi, [v]) when mi.IsGenericMethod && mi.GetGenericMethodDefinition() = deref ->
+            Some v
+        | PropertyGet(Some (RefExpr _ as v), pi, []) when pi.Name = "Value" ->
+            Some v
+        | _ ->
+            None
 
     let (|SetRef|_|) (e : Expr) =
         match e with
-            | Call(None, mi, [r;v]) when mi.IsGenericMethod && mi.GetGenericMethodDefinition() = setref ->
-                Some(r,v)
-            | _ ->
-                None
+        | Call(None, mi, [r;v]) when mi.IsGenericMethod && mi.GetGenericMethodDefinition() = setref ->
+            Some(r, v)
+        | PropertySet(Some (RefExpr _ as r), pi, [], v) when pi.Name = "Value" ->
+            Some(r, v)
+        | _ ->
+            None
 
     type MethodInfo with
         static member WriteOutputs = ShaderIO.WriteOutputsMeth

diff --git a/src/Tests/FShade.GLSL.Tests/SimpleTests.fs b/src/Tests/FShade.GLSL.Tests/SimpleTests.fs
@@ -360,6 +360,10 @@ let ``Bad Helpers``() =
 let util (a : ref<float>) =
     a := !a + 1.0
 
+[<ReflectedDefinition>]
+let util2 (a : ref<float>) =
+    a.Value <- a.Value + 1.0
+
 [<Test>]
 let ``Ref translated to inout``() =
     Setup.Run()
@@ -368,18 +372,19 @@ let ``Ref translated to inout``() =
         fragment {
             let a = ref v.pos.X
             util a
+            util2 a
             return !a * v.c
         }
 
-    let rx =
+    let rx name =
         String.concat "" [
-            "[ \t\r\n]*void[ \t]+(.*?)_util_(.*?)\(inout[ \t]+float[ \t]+a\)"
+            "[ \t\r\n]*void[ \t]+(.*?)_" + name + "_(.*?)\(inout[ \t]+float[ \t]+a\)"
             "[ \t\r\n]*\{"
             "[ \t\r\n]*a[ \t]+\=[ \t]+\(a[ \t]+\+[ \t]+1\.0\);"
             "[ \t\r\n]*\}"
         ]
 
-    GLSL.shouldCompileAndContainRegex [ Effect.ofFunction frag ] [rx]
+    GLSL.shouldCompileAndContainRegex [ Effect.ofFunction frag ] [rx "util"; rx "util2"]
 
 
 [<GLSLIntrinsic("atomicAdd({0}, {1})")>]