refactoring

1 files changed, 250 insertions, 240 deletions

diff --git a/lc/Builtins.lc b/lc/Builtins.lc
index 9484a9d9..29533cbf 100644
--- a/lc/Builtins.lc
+++ b/lc/Builtins.lc
@@ -11,16 +11,16 @@ id x = x
 
 ---------------------------------------
 
-class AttributeTuple a
-instance AttributeTuple a -- TODO
-class ValidOutput a
-instance ValidOutput a -- TODO
-
 data VecS (a :: Type) :: Nat -> Type where
   V2 :: a -> a -> VecS a 2
   V3 :: a -> a -> a -> VecS a 3
   V4 :: a -> a -> a -> a -> VecS a 4
 
+mapVec :: (a -> b) -> VecS a n -> VecS b n
+mapVec f (V2 x y) = V2 (f x) (f y)
+mapVec f (V3 x y z) = V3 (f x) (f y) (f z)
+mapVec f (V4 x y z w) = V4 (f x) (f y) (f z) (f w)
+
 type family Vec (n :: Nat) t  where Vec n t = VecS t n
 
 type family VecScalar (n :: Nat) a where
@@ -46,53 +46,6 @@ type family MatVecScalarElem a where
     MatVecScalarElem (VecS a n) = a
     MatVecScalarElem (Mat i j a) = a
 
---------------------------------------- swizzling
-
-mapVec :: (a -> b) -> VecS a n -> VecS b n
-mapVec f (V2 x y) = V2 (f x) (f y)
-mapVec f (V3 x y z) = V3 (f x) (f y) (f z)
-mapVec f (V4 x y z w) = V4 (f x) (f y) (f z) (f w)
-
-data Swizz = Sx | Sy | Sz | Sw
-
-data Swizz' :: Nat -> Type where
-    Sx' :: forall n . Swizz' (Succ n)
-    Sy' :: forall n . Swizz' (Succ (Succ n))
-    Sz' :: forall n . Swizz' (Succ (Succ (Succ n)))
-    Sw' :: forall n . Swizz' (Succ (Succ (Succ (Succ n))))
-
-swizzscalar' :: forall n -> Vec n a -> Swizz' n -> a
-{-
-swizzscalar' 2 = \x -> case x of
-    V2 x y -> \s -> case s of
-        Sx' -> x
-        Sy' -> y
-swizzscalar' 3 = \x -> case x of
-    V3 x y z -> \s -> case s of
-        Sx' -> x
--}
--- todo: make it more type safe
-swizzscalar :: forall n . Vec n a -> Swizz -> a
-swizzscalar (V2 x y) Sx = x
-swizzscalar (V2 x y) Sy = y
-swizzscalar (V3 x y z) Sx = x
-swizzscalar (V3 x y z) Sy = y
-swizzscalar (V3 x y z) Sz = z
-swizzscalar (V4 x y z w) Sx = x
-swizzscalar (V4 x y z w) Sy = y
-swizzscalar (V4 x y z w) Sz = z
-swizzscalar (V4 x y z w) Sw = w
-
--- used to prevent unfolding of swizzvector on variables (behind GPU lambda)
-definedVec :: forall a m . Vec m a -> Bool
-definedVec (V2 _ _) = True
-definedVec (V3 _ _ _) = True
-definedVec (V4 _ _ _ _) = True
-
-swizzvector :: forall n . forall m . Vec n a -> Vec m Swizz -> Vec m a
-swizzvector v w | definedVec v = mapVec (swizzscalar v) w
-
-
 --------------------------------------- type classes
 
 class Signed a
@@ -156,6 +109,239 @@ instance Floating       (Mat 4 2 Float)
 instance Floating       (Mat 4 3 Float)
 instance Floating       (Mat 4 4 Float)
 
+
+-------------------------------------------------------------------
+-- * Builtin Primitive Functions *
+-- Arithmetic Functions (componentwise)
+
+PrimAdd, PrimSub, PrimMul     :: Num (MatVecScalarElem a) => a -> a -> a
+PrimAddS, PrimSubS, PrimMulS  :: (t ~ MatVecScalarElem a, Num t) => a -> t -> a
+PrimDiv, PrimMod              :: (Num t, a ~ VecScalar d t) => a -> a -> a
+PrimDivS, PrimModS            :: (Num t, a ~ VecScalar d t) => a -> t -> a
+PrimNeg                       :: Signed (MatVecScalarElem a) => a -> a
+-- Bit-wise Functions
+PrimBAnd, PrimBOr, PrimBXor   :: (Integral t, a ~ VecScalar d t) => a -> a -> a
+PrimBAndS, PrimBOrS, PrimBXorS:: (Integral t, a ~ VecScalar d t) => a -> t -> a
+PrimBNot                      :: (Integral t, a ~ VecScalar d t) => a -> a
+PrimBShiftL, PrimBShiftR      :: (Integral t, a ~ VecScalar d t, b ~ VecScalar d Word) => a -> b -> a
+PrimBShiftLS, PrimBShiftRS    :: (Integral t, a ~ VecScalar d t) => a -> Word -> a
+-- Logic Functions
+PrimAnd, PrimOr, PrimXor      :: Bool -> Bool -> Bool
+PrimNot                       :: forall a d . (a ~ VecScalar d Bool) => a -> a
+PrimAny, PrimAll              :: VecScalar d Bool -> Bool
+
+-- Angle, Trigonometry and Exponential Functions
+PrimACos, PrimACosH, PrimASin, PrimASinH, PrimATan, PrimATanH, PrimCos, PrimCosH, PrimDegrees, PrimRadians, PrimSin, PrimSinH, PrimTan, PrimTanH, PrimExp, PrimLog, PrimExp2, PrimLog2, PrimSqrt, PrimInvSqrt
+                              :: (a ~ VecScalar d Float) => a -> a
+PrimPow, PrimATan2            :: (a ~ VecScalar d Float) => a -> a -> a
+-- Common Functions
+PrimFloor, PrimTrunc, PrimRound, PrimRoundEven, PrimCeil, PrimFract
+                              :: (a ~ VecScalar d Float) => a -> a
+PrimMin, PrimMax              :: (Num t, a ~ VecScalar d t) => a -> a -> a
+PrimMinS, PrimMaxS            :: (Num t, a ~ VecScalar d t) => a -> t -> a
+PrimIsNan, PrimIsInf          :: (a ~ VecScalar d Float, b ~ VecScalar d Bool) => a -> b
+PrimAbs, PrimSign             :: (Signed t, a ~ VecScalar d t) => a -> a
+PrimModF                      :: (a ~ VecScalar d Float) => a -> (a, a)
+PrimClamp                     :: (Num t, a ~ VecScalar d t) => a -> a -> a -> a
+PrimClampS                    :: (Num t, a ~ VecScalar d t) => a -> t -> t -> a
+PrimMix                       :: (a ~ VecScalar d Float) => a -> a -> a -> a
+PrimMixS                      :: (a ~ VecScalar d Float) => a -> a -> Float -> a
+PrimMixB                      :: (a ~ VecScalar d Float, b ~ VecScalar d Bool) => a -> a -> b -> a
+PrimStep                      :: (a ~ Vec d Float) => a -> a -> a
+PrimStepS                     :: (a ~ VecScalar d Float) => Float -> a -> a
+PrimSmoothStep                :: (a ~ Vec d Float) => a -> a -> a -> a
+PrimSmoothStepS               :: (a ~ VecScalar d Float) => Float -> Float -> a -> a
+
+-- Integer/Floatonversion Functions
+PrimFloatBitsToInt            :: VecScalar d Float -> VecScalar d Int
+PrimFloatBitsToUInt           :: VecScalar d Float -> VecScalar d Word
+PrimIntBitsToFloat            :: VecScalar d Int   -> VecScalar d Float
+PrimUIntBitsToFloat           :: VecScalar d Word  -> VecScalar d Float
+-- Geometric Functions
+PrimLength                    :: (a ~ VecScalar d Float) => a -> Float
+PrimDistance, PrimDot         :: (a ~ VecScalar d Float) => a -> a -> Float
+PrimCross                     :: (a ~ VecScalar 3 Float) => a -> a -> a
+PrimNormalize                 :: (a ~ VecScalar d Float) => a -> a
+PrimFaceForward, PrimRefract  :: (a ~ VecScalar d Float) => a -> a -> a -> a
+PrimReflect                   :: (a ~ VecScalar d Float) => a -> a -> a
+-- Matrix Functions
+PrimTranspose                 :: Mat h w a -> Mat w h a
+PrimDeterminant               :: Mat s s a -> Float
+PrimInverse                   :: Mat s s a -> Mat s s a
+PrimOuterProduct              :: Vec w a   -> Vec h a   -> Mat h w a
+PrimMulMatVec                 :: Mat h w a -> Vec w a   -> Vec h a
+PrimMulVecMat                 :: Vec h a   -> Mat h w a -> Vec w a
+PrimMulMatMat                 :: Mat i j a -> Mat j k a -> Mat i k a
+-- Vector and Scalar Relational Functions
+PrimLessThan, PrimLessThanEqual, PrimGreaterThan, PrimGreaterThanEqual, PrimEqualV, PrimNotEqualV
+                              :: forall a d t b . (Num t, a ~ VecScalar d t, b ~ VecScalar d Bool) => a -> a -> b
+PrimEqual, PrimNotEqual       :: forall a t . (t ~ MatVecScalarElem a) => a -> a -> Bool
+-- Fragment Processing Functions
+PrimDFdx, PrimDFdy, PrimFWidth
+                              :: (a ~ VecScalar d Float) => a -> a
+-- Noise Functions
+PrimNoise1                    :: VecScalar d Float -> Float
+PrimNoise2                    :: VecScalar d Float -> Vec 2 Float
+PrimNoise3                    :: VecScalar d Float -> Vec 3 Float
+PrimNoise4                    :: VecScalar d Float -> Vec 4 Float
+
+{-
+-- Vec/Mat (de)construction
+PrimTupToV2                   :: Component a => PrimFun stage ((a,a)     -> V2 a)
+PrimTupToV3                   :: Component a => PrimFun stage ((a,a,a)   -> V3 a)
+PrimTupToV4                   :: Component a => PrimFun stage ((a,a,a,a) -> V4 a)
+PrimV2ToTup                   :: Component a => PrimFun stage (V2 a     -> (a,a))
+PrimV3ToTup                   :: Component a => PrimFun stage (V3 a   -> (a,a,a))
+PrimV4ToTup                   :: Component a => PrimFun stage (V4 a -> (a,a,a,a))
+-}
+
+-------------------------------------------------------
+
+head (x: _) = x
+
+[]   ++ ys = ys
+x:xs ++ ys = x : xs ++ ys
+
+foldr f e [] = e
+foldr f e (x: xs) = f x (foldr f e xs)
+
+concat = foldr (++) []
+
+map _ []     = []
+map f (x:xs) = f x : map f xs
+
+concatMap :: (a -> [b]) -> [a] -> [b]
+concatMap f x = concat (map f x)
+
+-------------------
+
+data Maybe a
+    = Nothing
+    | Just a
+--    deriving (Eq, Ord, Show)
+
+data Vector (n :: Nat) t
+
+-------------------------------------------------------
+
+data PrimitiveType
+    = Triangle
+    | Line
+    | Point
+    | TriangleAdjacency
+    | LineAdjacency
+
+data Primitive a :: PrimitiveType -> Type where
+    PrimPoint    :: a           -> Primitive a Point
+    PrimLine     :: a -> a      -> Primitive a Line
+    PrimTriangle :: a -> a -> a -> Primitive a Triangle
+
+mapPrimitive :: (a -> b) -> Primitive a p -> Primitive b p
+{- todo
+mapPrimitive f (PrimPoint a) = PrimPoint (f a)
+mapPrimitive f (PrimLine a b) = PrimLine (f a) (f b)
+mapPrimitive f (PrimTriangle a b c) = PrimTriangle (f a) (f b) (f c)
+-}
+
+type PrimitiveStream a t = [Primitive t a]
+
+mapPrimitives :: (a -> b) -> PrimitiveStream p a -> PrimitiveStream p b
+mapPrimitives f = map (mapPrimitive f)
+
+type family ListElem a where ListElem [a] = a
+
+--class AttributeTuple a
+--instance AttributeTuple a -- TODO
+
+fetchArrays :: forall a t t' . ({-AttributeTuple t, -} t ~ map ListElem t') => HList t' -> PrimitiveStream a (HList t)
+
+fetch       :: forall a t . {-(AttributeTuple t) => -} String -> t -> PrimitiveStream a t
+
+------------------------------------------------------
+
+type Fragment n t = Vector n (Maybe (SimpleFragment t))
+
+data SimpleFragment t = SimpleFragment
+    { sFragmentCoords   :: Vec 3 Float
+    , sFragmentValue    :: t
+    }
+
+type FragmentStream n t = [Fragment n t]
+
+customizeDepth :: (a -> Float) -> Fragment n a -> Fragment n a
+
+customizeDepths :: (a -> Float) -> FragmentStream n a -> FragmentStream n a
+customizeDepths f = map (customizeDepth f)
+
+filterFragment :: (a -> Bool) -> Fragment n a -> Fragment n a
+
+filterFragments :: (a -> Bool) -> FragmentStream n a -> FragmentStream n a
+filterFragments p = map (filterFragment p)
+
+mapFragment :: (a -> b) -> Fragment n a -> Fragment n b
+
+mapFragments :: (a -> b) -> FragmentStream n a -> FragmentStream n b
+mapFragments f = map (mapFragment f)
+
+-------------------------------------------------------------------------
+
+data ImageSemantics = Depth Type | Stencil Type | Color Type
+
+data Image (n :: Nat) (t :: ImageSemantics) -- = Vector n [[t]]
+
+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)
+
+emptyDepthImage = DepthImage @1
+emptyColorImage = ColorImage @1
+
+-------------------------------------------------------------------------
+
+
+--------------------------------------- swizzling
+
+data Swizz = Sx | Sy | Sz | Sw
+{-
+data Swizz' :: Nat -> Type where
+    Sx' :: forall n . Swizz' (Succ n)
+    Sy' :: forall n . Swizz' (Succ (Succ n))
+    Sz' :: forall n . Swizz' (Succ (Succ (Succ n)))
+    Sw' :: forall n . Swizz' (Succ (Succ (Succ (Succ n))))
+
+swizzscalar' :: forall n -> Vec n a -> Swizz' n -> a
+swizzscalar' 2 = \x -> case x of
+    V2 x y -> \s -> case s of
+        Sx' -> x
+        Sy' -> y
+swizzscalar' 3 = \x -> case x of
+    V3 x y z -> \s -> case s of
+        Sx' -> x
+-}
+-- todo: make it more type safe
+swizzscalar :: forall n . Vec n a -> Swizz -> a
+swizzscalar (V2 x y) Sx = x
+swizzscalar (V2 x y) Sy = y
+swizzscalar (V3 x y z) Sx = x
+swizzscalar (V3 x y z) Sy = y
+swizzscalar (V3 x y z) Sz = z
+swizzscalar (V4 x y z w) Sx = x
+swizzscalar (V4 x y z w) Sy = y
+swizzscalar (V4 x y z w) Sz = z
+swizzscalar (V4 x y z w) Sw = w
+
+-- used to prevent unfolding of swizzvector on variables (behind GPU lambda)
+definedVec :: forall a m . Vec m a -> Bool
+definedVec (V2 _ _) = True
+definedVec (V3 _ _ _) = True
+definedVec (V4 _ _ _ _) = True
+
+swizzvector :: forall n . forall m . Vec n a -> Vec m Swizz -> Vec m a
+swizzvector v w | definedVec v = mapVec (swizzscalar v) w
+
+-----------------------------------------------------------------------------
+
 data BlendingFactor
     = Zero' --- FIXME: modified
     | One
@@ -244,15 +430,6 @@ data PointSpriteCoordOrigin
     = LowerLeft
     | UpperLeft
 
-data ImageSemantics = Depth Type | Stencil Type | Color Type
-
-data PrimitiveType
-    = Triangle
-    | Line
-    | Point
-    | TriangleAdjacency
-    | LineAdjacency
-
 -- builtin
 primTexture :: () -> Vec 2 Float -> Vec 4 Float
 
@@ -265,13 +442,6 @@ data RasterContext a :: PrimitiveType -> Type where
   PointCtx            :: PointSize a -> Float -> PointSpriteCoordOrigin                -> RasterContext a Point
   LineCtx             :: Float -> ProvokingVertex                                      -> RasterContext a Line
 
-map _ []     = []
-map f (x:xs) = f x : map f xs
-
-type family ListElem a where ListElem [a] = a
-
-type family HListElem a :: [Type] where HListElem (HList l) = l
-
 data Blending :: Type -> Type where
   NoBlending          ::                                   Blending t
   BlendLogicOp        :: (Integral t) => LogicOperation -> Blending t
@@ -288,71 +458,6 @@ data FragmentOperation :: ImageSemantics -> Type where
   DepthOp             :: ComparisonFunction -> Bool                -> FragmentOperation (Depth Float)
   StencilOp           :: StencilTests -> StencilOps -> StencilOps  -> FragmentOperation (Stencil Int32)
 
-[]   ++ ys = ys
-x:xs ++ ys = x : xs ++ ys
-
-foldr f e [] = e
-foldr f e (x: xs) = f x (foldr f e xs)
-
-concat = foldr (++) []
-
-concatMap :: (a -> [b]) -> [a] -> [b]
-concatMap f x = concat (map f x)
-
-data Primitive a :: PrimitiveType -> Type where
-    PrimPoint    :: a           -> Primitive a Point
-    PrimLine     :: a -> a      -> Primitive a Line
-    PrimTriangle :: a -> a -> a -> Primitive a Triangle
-
-type PrimitiveStream a t = [Primitive t a]
-
-mapPrimitive :: (a -> b) -> Primitive a p -> Primitive b p
-{- todo
-mapPrimitive f (PrimPoint a) = PrimPoint (f a)
-mapPrimitive f (PrimLine a b) = PrimLine (f a) (f b)
-mapPrimitive f (PrimTriangle a b c) = PrimTriangle (f a) (f b) (f c)
--}
-
-fetch               :: forall a t . (AttributeTuple t) => String -> t -> PrimitiveStream a t
-fetchArrays         :: forall a t t' . (AttributeTuple t, t ~ HList (map ListElem (HListElem t'))) => t' -> PrimitiveStream a t
-
-mapPrimitives :: (a -> b) -> PrimitiveStream p a -> PrimitiveStream p b
-mapPrimitives f = map (mapPrimitive f)
-
--------------------
-
-data Maybe a
-    = Nothing
-    | Just a
---    deriving (Eq, Ord, Show)
-
-data Vector (n :: Nat) t
-
-type Fragment n t = Vector n (Maybe (SimpleFragment t))
-
-data SimpleFragment t = SimpleFragment
-    { sFragmentCoords   :: Vec 3 Float
-    , sFragmentValue    :: t
-    }
-
-type FragmentStream n t = [Fragment n t]
-
-customizeDepth :: (a -> Float) -> Fragment n a -> Fragment n a
-
-customizeDepths :: (a -> Float) -> FragmentStream n a -> FragmentStream n a
-customizeDepths f = map (customizeDepth f)
-
-filterFragment :: (a -> Bool) -> Fragment n a -> Fragment n a
-
-filterFragments :: (a -> Bool) -> FragmentStream n a -> FragmentStream n a
-filterFragments p = map (filterFragment p)
-
-mapFragment :: (a -> b) -> Fragment n a -> Fragment n b
-
-mapFragments :: (a -> b) -> FragmentStream n a -> FragmentStream n b
-mapFragments f = map (mapFragment f)
-
-
 data Interpolated t where
   Smooth, NoPerspective
                       :: (Floating t) => Interpolated t
@@ -368,13 +473,6 @@ rasterizePrimitive
 
 rasterizePrimitives ctx is s = concat (map (rasterizePrimitive is ctx) s)
 
-data Image (n :: Nat) (t :: ImageSemantics) -- = Vector n [[t]]
-
-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 ImageLC a :: Nat where ImageLC (Image n t) = n
 
 allSame :: [a] -> Type
@@ -409,21 +507,21 @@ type family FragmentOperationSem a :: ImageSemantics where FragmentOperationSem
 
 Accumulate :: forall (n :: Nat) (c :: [Type]) . (b ~ map FragmentOperationSem c) => HList c -> FragmentStream n (HList (remSemantics' b)) -> FrameBuffer n b -> FrameBuffer n b
 
-type family ImageSem a  :: ImageSemantics where ImageSem (Image n t) = t
+accumulateWith ctx x = (ctx, x)
+overlay cl (ctx, str) = Accumulate ctx str cl
 
-tfFrameBuffer t = map 'ImageSem t
+infixl 0 `overlay`
 
-class ValidFrameBuffer (a :: [ImageSemantics])
-instance ValidFrameBuffer a -- TODO
+type family ImageSem a  :: ImageSemantics where ImageSem (Image n t) = t
 
-head (x: _) = x
+--class ValidFrameBuffer (a :: [ImageSemantics])
+--instance ValidFrameBuffer a -- TODO
 
-FrameBuffer  :: forall (a :: [Type]) . (sameLayerCounts a) => HList a -> FrameBuffer (ImageLC (head a)) (tfFrameBuffer a)
+FrameBuffer  :: forall (a :: [Type]) . (sameLayerCounts a) => HList a -> FrameBuffer (ImageLC (head a)) (map ImageSem a)
 
-accumulate ctx fshader fstr fb = Accumulate ctx (mapFragments fshader fstr) fb
+imageFrame = FrameBuffer
 
--- todo: remove
-accumulationContext x = x
+accumulate ctx fshader fstr fb = Accumulate ctx (mapFragments fshader fstr) fb
 
 -- texture support
 PrjImage            :: FrameBuffer 1 '[a] -> Image 1 a
@@ -432,90 +530,7 @@ PrjImageColor       :: FrameBuffer 1 '[Depth 'Float, Color '(Vec 4 Float)] -> Im
 data Output where
   ScreenOut           :: FrameBuffer a b -> Output
 
--------------------------------------------------------------------
--- * Builtin Primitive Functions *
--- Arithmetic Functions (componentwise)
-
-PrimAdd, PrimSub, PrimMul     :: Num (MatVecScalarElem a) => a -> a -> a
-PrimAddS, PrimSubS, PrimMulS  :: (t ~ MatVecScalarElem a, Num t) => a -> t -> a
-PrimDiv, PrimMod              :: (Num t, a ~ VecScalar d t) => a -> a -> a
-PrimDivS, PrimModS            :: (Num t, a ~ VecScalar d t) => a -> t -> a
-PrimNeg                       :: Signed (MatVecScalarElem a) => a -> a
--- Bit-wise Functions
-PrimBAnd, PrimBOr, PrimBXor   :: (Integral t, a ~ VecScalar d t) => a -> a -> a
-PrimBAndS, PrimBOrS, PrimBXorS:: (Integral t, a ~ VecScalar d t) => a -> t -> a
-PrimBNot                      :: (Integral t, a ~ VecScalar d t) => a -> a
-PrimBShiftL, PrimBShiftR      :: (Integral t, a ~ VecScalar d t, b ~ VecScalar d Word) => a -> b -> a
-PrimBShiftLS, PrimBShiftRS    :: (Integral t, a ~ VecScalar d t) => a -> Word -> a
--- Logic Functions
-PrimAnd, PrimOr, PrimXor      :: Bool -> Bool -> Bool
-PrimNot                       :: forall a d . (a ~ VecScalar d Bool) => a -> a
-PrimAny, PrimAll              :: VecScalar d Bool -> Bool
-
--- Angle, Trigonometry and Exponential Functions
-PrimACos, PrimACosH, PrimASin, PrimASinH, PrimATan, PrimATanH, PrimCos, PrimCosH, PrimDegrees, PrimRadians, PrimSin, PrimSinH, PrimTan, PrimTanH, PrimExp, PrimLog, PrimExp2, PrimLog2, PrimSqrt, PrimInvSqrt
-                              :: (a ~ VecScalar d Float) => a -> a
-PrimPow, PrimATan2            :: (a ~ VecScalar d Float) => a -> a -> a
--- Common Functions
-PrimFloor, PrimTrunc, PrimRound, PrimRoundEven, PrimCeil, PrimFract
-                              :: (a ~ VecScalar d Float) => a -> a
-PrimMin, PrimMax              :: (Num t, a ~ VecScalar d t) => a -> a -> a
-PrimMinS, PrimMaxS            :: (Num t, a ~ VecScalar d t) => a -> t -> a
-PrimIsNan, PrimIsInf          :: (a ~ VecScalar d Float, b ~ VecScalar d Bool) => a -> b
-PrimAbs, PrimSign             :: (Signed t, a ~ VecScalar d t) => a -> a
-PrimModF                      :: (a ~ VecScalar d Float) => a -> (a, a)
-PrimClamp                     :: (Num t, a ~ VecScalar d t) => a -> a -> a -> a
-PrimClampS                    :: (Num t, a ~ VecScalar d t) => a -> t -> t -> a
-PrimMix                       :: (a ~ VecScalar d Float) => a -> a -> a -> a
-PrimMixS                      :: (a ~ VecScalar d Float) => a -> a -> Float -> a
-PrimMixB                      :: (a ~ VecScalar d Float, b ~ VecScalar d Bool) => a -> a -> b -> a
-PrimStep                      :: (a ~ Vec d Float) => a -> a -> a
-PrimStepS                     :: (a ~ VecScalar d Float) => Float -> a -> a
-PrimSmoothStep                :: (a ~ Vec d Float) => a -> a -> a -> a
-PrimSmoothStepS               :: (a ~ VecScalar d Float) => Float -> Float -> a -> a
-
--- Integer/Floatonversion Functions
-PrimFloatBitsToInt            :: VecScalar d Float -> VecScalar d Int
-PrimFloatBitsToUInt           :: VecScalar d Float -> VecScalar d Word
-PrimIntBitsToFloat            :: VecScalar d Int   -> VecScalar d Float
-PrimUIntBitsToFloat           :: VecScalar d Word  -> VecScalar d Float
--- Geometric Functions
-PrimLength                    :: (a ~ VecScalar d Float) => a -> Float
-PrimDistance, PrimDot         :: (a ~ VecScalar d Float) => a -> a -> Float
-PrimCross                     :: (a ~ VecScalar 3 Float) => a -> a -> a
-PrimNormalize                 :: (a ~ VecScalar d Float) => a -> a
-PrimFaceForward, PrimRefract  :: (a ~ VecScalar d Float) => a -> a -> a -> a
-PrimReflect                   :: (a ~ VecScalar d Float) => a -> a -> a
--- Matrix Functions
-PrimTranspose                 :: Mat h w a -> Mat w h a
-PrimDeterminant               :: Mat s s a -> Float
-PrimInverse                   :: Mat s s a -> Mat s s a
-PrimOuterProduct              :: Vec w a   -> Vec h a   -> Mat h w a
-PrimMulMatVec                 :: Mat h w a -> Vec w a   -> Vec h a
-PrimMulVecMat                 :: Vec h a   -> Mat h w a -> Vec w a
-PrimMulMatMat                 :: Mat i j a -> Mat j k a -> Mat i k a
--- Vector and Scalar Relational Functions
-PrimLessThan, PrimLessThanEqual, PrimGreaterThan, PrimGreaterThanEqual, PrimEqualV, PrimNotEqualV
-                              :: forall a d t b . (Num t, a ~ VecScalar d t, b ~ VecScalar d Bool) => a -> a -> b
-PrimEqual, PrimNotEqual       :: forall a t . (t ~ MatVecScalarElem a) => a -> a -> Bool
--- Fragment Processing Functions
-PrimDFdx, PrimDFdy, PrimFWidth
-                              :: (a ~ VecScalar d Float) => a -> a
--- Noise Functions
-PrimNoise1                    :: VecScalar d Float -> Float
-PrimNoise2                    :: VecScalar d Float -> Vec 2 Float
-PrimNoise3                    :: VecScalar d Float -> Vec 3 Float
-PrimNoise4                    :: VecScalar d Float -> Vec 4 Float
-
-{-
--- Vec/Mat (de)construction
-PrimTupToV2                   :: Component a => PrimFun stage ((a,a)     -> V2 a)
-PrimTupToV3                   :: Component a => PrimFun stage ((a,a,a)   -> V3 a)
-PrimTupToV4                   :: Component a => PrimFun stage ((a,a,a,a) -> V4 a)
-PrimV2ToTup                   :: Component a => PrimFun stage (V2 a     -> (a,a))
-PrimV3ToTup                   :: Component a => PrimFun stage (V3 a   -> (a,a,a))
-PrimV4ToTup                   :: Component a => PrimFun stage (V4 a -> (a,a,a,a))
--}
+renderFrame = ScreenOut
 
 --------------------
 -- * Texture support
@@ -544,12 +559,7 @@ data Sampler = Sampler Filter EdgeMode Texture
 texture2D :: Sampler -> Vec 2 Float -> Vec 4 Float
 
 
-accumulateWith ctx x = (ctx, x)
-overlay cl (ctx, str) = Accumulate ctx str cl
-renderFrame = ScreenOut
-imageFrame = FrameBuffer
-emptyDepthImage = DepthImage @1
-emptyColorImage = ColorImage @1
+-- todo: remove
+accumulationContext x = x
 
-infixl 0 `overlay`