3 files changed, 25 insertions, 7 deletions

diff --git a/TODO b/TODO
index ceab6100..a6f44b1f 100644
--- a/TODO
+++ b/TODO
@@ -101,10 +101,13 @@ next:
 - support recursive local definitions
 - mutual recursion (inference & reduction)
 
+- backend: setup texture sampler configuration
+  done - haskell (opengl 3.3): sampler object
+  - purescript (webgl)
+done - backend: include compiler version in the generated pipeline as a string info field
 - editor: user texture support (maybe from external source)
 - editor: highlight errors in editor
 - editor: editor socket reconnection
-- backend: include compiler version in the generated pipeline as a string info field
 - backend: generate let in shaders
 - backend: array support
 - backend: GLSL codegen doesn't support Vector and tuple patterns (not compiler frontend related):
@@ -112,7 +115,6 @@ next:
           fragment02vectorpattern
           fragment05uniform
 - backend: basic pipeline optimization (let-floating)
-- backend: setup texture sampler configuration
 - backend: setup viewport for render target size (purescript)
 - documentation: getting started: hello world on various platforms  +Csaba
 - minimal quake videos
diff --git a/lambdacube-compiler.cabal b/lambdacube-compiler.cabal
index 58ab87d0..a4a9999d 100644
--- a/lambdacube-compiler.cabal
+++ b/lambdacube-compiler.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                lambdacube-compiler
-version:             0.4.0.0
+version:             0.5.0.0
 homepage:            http://lambdacube3d.com
 synopsis:            LambdaCube 3D is a DSL to program GPUs
 description:         LambdaCube 3D is a domain specific language and library that makes it
@@ -82,7 +82,7 @@ library
     indentation >= 0.2 && <0.3,
     pretty-compact >=1.0 && <1.1,
     text >= 1.2 && <1.3,
-    lambdacube-ir == 0.2.*,
+    lambdacube-ir == 0.3.*,
     vector >= 0.11 && <0.12
 
   hs-source-dirs:      src
@@ -136,7 +136,7 @@ executable lambdacube-compiler-test-suite
     pretty-compact >=1.0 && <1.1,
     text >= 1.2 && <1.3,
     time >= 1.5 && <1.6,
-    lambdacube-ir == 0.2.*,
+    lambdacube-ir == 0.3.*,
     vector >= 0.11 && <0.12
 
   if flag(profiling)
@@ -188,7 +188,7 @@ executable lambdacube-compiler-coverage-test-suite
     directory,
     exceptions >= 0.8 && <0.9,
     filepath,
-    lambdacube-ir == 0.2.*,
+    lambdacube-ir == 0.3.*,
     mtl >=2.2 && <2.3,
     monad-control >= 1.0 && <1.1,
     optparse-applicative == 0.12.*,
diff --git a/src/LambdaCube/Compiler/CoreToIR.hs b/src/LambdaCube/Compiler/CoreToIR.hs
index 04ce6ed1..4d1a38af 100644
--- a/src/LambdaCube/Compiler/CoreToIR.hs
+++ b/src/LambdaCube/Compiler/CoreToIR.hs
@@ -40,13 +40,27 @@ import LambdaCube.Compiler.Pretty hiding (parens)
 import qualified LambdaCube.Compiler.Infer as I
 import LambdaCube.Compiler.Infer (SName, Lit(..), Visibility(..))
 
+import Data.Version
+import Paths_lambdacube_compiler (version)
+
 --------------------------------------------------------------------------
 
 type CG = State IR.Pipeline
 
 pattern TFrameBuffer a b <- A2 "FrameBuffer" a b
 
-emptyPipeline b = IR.Pipeline b mempty mempty mempty mempty mempty mempty mempty
+emptyPipeline b = IR.Pipeline
+  { IR.info       = mempty
+  , IR.backend    = b
+  , IR.textures   = mempty
+  , IR.samplers   = mempty
+  , IR.targets    = mempty
+  , IR.programs   = mempty
+  , IR.slots      = mempty
+  , IR.streams    = mempty
+  , IR.commands   = mempty
+  }
+
 update i x xs = xs Vector.// [(i,x)]
 
 newTexture :: Int -> Int -> IR.ImageSemantic -> CG IR.TextureName
@@ -98,6 +112,8 @@ compilePipeline :: IR.Backend -> I.ExpType -> IR.Pipeline
 compilePipeline b e = flip execState (emptyPipeline b) $ do
     (subCmds,cmds) <- getCommands $ toExp e
     modify (\s -> s {IR.commands = Vector.fromList subCmds <> Vector.fromList cmds})
+    -- add compiler version to pipeline info
+    modify (\s -> s {IR.info = "generated by lambdcube-compiler " ++ showVersion version})
 
 mergeSlot a b = a
   { IR.slotUniforms = IR.slotUniforms a <> IR.slotUniforms b