refactor Builtins.lc

1 files changed, 14 insertions, 13 deletions

diff --git a/lc/Builtins.lc b/lc/Builtins.lc
index a8b9e98b..80a818eb 100644
--- a/lc/Builtins.lc
+++ b/lc/Builtins.lc
@@ -295,12 +295,12 @@ type family FragOps a where
     FragOps (FragmentOperation t1, FragmentOperation t2, FragmentOperation t3, FragmentOperation t4) = (t1, t2, t3, t4)
     FragOps (FragmentOperation t1, FragmentOperation t2, FragmentOperation t3, FragmentOperation t4, FragmentOperation t5) = (t1, t2, t3, t4, t5)
 -}
-type family FragOps' a where
-    FragOps' (t1, t2) = (FragmentOperation t1, FragmentOperation t2)
-    FragOps' (t1, t2, t3) = (FragmentOperation t1, FragmentOperation t2, FragmentOperation t3)
-    FragOps' (t1, t2, t3, t4) =  (FragmentOperation t1, FragmentOperation t2, FragmentOperation t3, FragmentOperation t4)
-    FragOps' (t1, t2, t3, t4, t5) =  (FragmentOperation t1, FragmentOperation t2, FragmentOperation t3, FragmentOperation t4, FragmentOperation t5)
-    FragOps' t = (FragmentOperation t)
+type family FragOps a where
+    FragOps (t1, t2) = (FragmentOperation t1, FragmentOperation t2)
+    FragOps (t1, t2, t3) = (FragmentOperation t1, FragmentOperation t2, FragmentOperation t3)
+    FragOps (t1, t2, t3, t4) =  (FragmentOperation t1, FragmentOperation t2, FragmentOperation t3, FragmentOperation t4)
+    FragOps (t1, t2, t3, t4, t5) =  (FragmentOperation t1, FragmentOperation t2, FragmentOperation t3, FragmentOperation t4, FragmentOperation t5)
+    FragOps t = (FragmentOperation t)
 
 []   ++ ys = ys
 x:xs ++ ys = x : xs ++ ys
@@ -407,11 +407,12 @@ rasterize
 
 rasterizePrimitives ctx is s = concat (map (rasterize is ctx) s)
 
-data Image :: Nat -> Type -> Type where
-  ColorImage          :: forall a d t color . (Num t, color ~ VecScalar d t)
-                      => color  -> Image a (Color color)
-  DepthImage          :: forall a . Float  -> Image a (Depth Float)
-  StencilImage        :: forall a . Int    -> Image a (Stencil Int)
+data Image :: Nat -> Type -> Type
+
+ColorImage          :: forall a d t color . (Num t, color ~ VecScalar d t)
+                    => color  -> Image a (Color color)
+DepthImage          :: forall a . Float  -> Image a (Depth Float)
+StencilImage        :: forall a . Int    -> Image a (Stencil Int)
 
 type family SameLayerCounts a where
     SameLayerCounts (Image n1 t1) = Unit
@@ -427,8 +428,8 @@ instance (DefaultFragOp a, DefaultFragOp b) => DefaultFragOps (FragmentOperation
     defaultFragOps = -- (undefined @(), undefined) 
             (defaultFragOp @a @_, defaultFragOp @b @_)
 -}
-data FrameBuffer (n :: Nat) b where
-  Accumulate   :: FragOps' b -> FragmentStream n (RemSemantics b) -> FrameBuffer n b -> FrameBuffer n b
+data FrameBuffer (n :: Nat) t
+Accumulate :: FragOps b -> FragmentStream n (RemSemantics b) -> FrameBuffer n b -> FrameBuffer n b
 
 type family TFFrameBuffer a where
     TFFrameBuffer (Image n1 t1) = FrameBuffer n1 t1