remove tuples from IR type

2 files changed, 33 insertions, 13 deletions

diff --git a/Definitions.hs b/Definitions.hs
index 233e695..0423123 100644
--- a/Definitions.hs
+++ b/Definitions.hs
@@ -251,10 +251,15 @@ ir = execWriter $ do
   data_ "Blending" $ do
     enum_ "NoBlending"
     const_ "BlendLogicOp"  ["LogicOperation"]
-    const_ "Blend"         [ Tuple ["BlendEquation", "BlendEquation"]
-                           , Tuple [Tuple ["BlendingFactor","BlendingFactor"],Tuple ["BlendingFactor","BlendingFactor"]]
-                           , v4f
-                           ]
+    constR_ "Blend"
+      [ "colorEqSrc"  #:: "BlendEquation"
+      , "alphaEqSrc"  #:: "BlendEquation"
+      , "colorFSrc"   #:: "BlendingFactor"
+      , "colorFDst"   #:: "BlendingFactor"
+      , "alphaFSrc"   #:: "BlendingFactor"
+      , "alphaFDst"   #:: "BlendingFactor"
+      , "color"       #:: v4f
+      ]
 
   data_ "RasterContext" $ do
     const_ "PointCtx"      ["PointSize", Float, "PointSpriteCoordOrigin"]
@@ -315,6 +320,12 @@ ir = execWriter $ do
     enum_ "Stencil"
     enum_ "Color"
 
+  data_ "ClearImage" $ do
+    constR_ "ClearImage"
+      [ "imageSemantic" #:: "ImageSemantic"
+      , "clearValue"    #:: "Value"
+      ]
+
   data_ "Command" $ do
     const_ "SetRasterContext"          ["RasterContext"]
     const_ "SetAccumulationContext"    ["AccumulationContext"]
@@ -325,7 +336,7 @@ ir = execWriter $ do
     const_ "SetSampler"                ["TextureUnit", Maybe "SamplerName"]     -- binds sampler to the specified texture unit
     const_ "RenderSlot"                ["SlotName"]
     const_ "RenderStream"              ["StreamName"]
-    const_ "ClearRenderTarget"         [Array (Tuple ["ImageSemantic","Value"])]
+    const_ "ClearRenderTarget"         [Array "ClearImage"]
     const_ "GenerateMipMap"            ["TextureUnit"]
     const_ "SaveImage"                 ["FrameBufferComponent", "ImageRef"]                            -- from framebuffer component to texture (image)
     const_ "LoadImage"                 ["ImageRef", "FrameBufferComponent"]                            -- from texture (image) to framebuffer component
@@ -354,12 +365,18 @@ ir = execWriter $ do
       , "samplerCompareFunc"    #:: Maybe "ComparisonFunction"
       ]
 
+  data_ "Parameter" $ do 
+    constR_ "Parameter"
+      [ "name"  #:: String
+      , "ty"    #:: "InputType"
+      ]
+
   data_ "Program" $ do   -- AST, input
     constR_ "Program"
-      [ "programUniforms"   #:: Map "UniformName" "InputType"    -- uniform input (value based uniforms only / no textures)
-      , "programStreams"    #:: Map "UniformName" (Tuple [String,"InputType"])  -- vertex shader input attribute name -> (slot attribute name, attribute type)
-      , "programInTextures" #:: Map "UniformName" "InputType"               -- all textures (uniform textures and render textures) referenced by the program
-      , "programOutput"     #:: Array (Tuple [String,"InputType"])
+      [ "programUniforms"   #:: Map "UniformName" "InputType"   -- uniform input (value based uniforms only / no textures)
+      , "programStreams"    #:: Map "UniformName" "Parameter"   -- vertex shader input attribute name -> (slot attribute name, attribute type)
+      , "programInTextures" #:: Map "UniformName" "InputType"   -- all textures (uniform textures and render textures) referenced by the program
+      , "programOutput"     #:: Array "Parameter"
       , "vertexShader"      #:: String
       , "geometryShader"    #:: Maybe String
       , "fragmentShader"    #:: String
@@ -382,9 +399,15 @@ ir = execWriter $ do
       , "streamPrograms"  #:: Array "ProgramName"
       ]
 
+  data_ "TargetItem" $ do
+    constR_ "TargetItem"
+      [ "targetSemantic"  #:: "ImageSemantic"
+      , "targetRef"       #:: Maybe "ImageRef"
+      ]
+
   data_ "RenderTarget" $ do
     constR_ "RenderTarget"
-      [ "renderTargets" #:: Array (Tuple ["ImageSemantic",Maybe "ImageRef"]) -- render texture or default framebuffer (semantic, render texture for the program output)
+      [ "renderTargets" #:: Array "TargetItem" -- render texture or default framebuffer (semantic, render texture for the program output)
       ]
 
   data_ "Backend" $ do
diff --git a/Language.hs b/Language.hs
index ae38916..1950c6e 100644
--- a/Language.hs
+++ b/Language.hs
@@ -49,7 +49,6 @@ data Type
   -- higher order types
   | Array Type
   | List Type
-  | Tuple [Type]
   | Maybe Type
   | Map Type Type
   -- user defined
@@ -97,7 +96,6 @@ psType = \case
 
   Array t       -> "Array " ++ parens (hsType t)
   List t        -> "List " ++ parens (hsType t)
-  Tuple l       -> "(" ++ intercalate "," (map hsType l) ++ ")"
   Maybe t       -> "Maybe " ++ parens (hsType t)
   Map String v  -> "StrMap " ++ parens (hsType v)
   Map k v       -> "Map " ++ parens (hsType k) ++ " " ++ parens (hsType v)
@@ -141,7 +139,6 @@ hsType = \case
 
   Array t       -> "[" ++ hsType t ++ "]"
   List t        -> "[" ++ hsType t ++ "]"
-  Tuple l       -> "(" ++ intercalate "," (map hsType l) ++ ")"
   Maybe t       -> "Maybe " ++ parens (hsType t)
   Map k v       -> "Map " ++ parens (hsType k) ++ " " ++ parens (hsType v)
   -- user defined