summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/LambdaCube/GL/Input.hs3
-rw-r--r--src/LambdaCube/GL/Type.hs2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/LambdaCube/GL/Input.hs b/src/LambdaCube/GL/Input.hs
index 596563a..742fc35 100644
--- a/src/LambdaCube/GL/Input.hs
+++ b/src/LambdaCube/GL/Input.hs
@@ -8,6 +8,7 @@ import Data.Map (Map)
8import Data.IntMap (IntMap) 8import Data.IntMap (IntMap)
9import Data.Vector (Vector,(//),(!)) 9import Data.Vector (Vector,(//),(!))
10import Data.Word 10import Data.Word
11import Data.String
11import Foreign 12import Foreign
12import qualified Data.IntMap as IM 13import qualified Data.IntMap as IM
13import qualified Data.Set as S 14import qualified Data.Set as S
@@ -42,7 +43,7 @@ mkUniform :: [(String,InputType)] -> IO (Map GLUniformName InputSetter, Map Stri
42mkUniform l = do 43mkUniform l = do
43 unisAndSetters <- forM l $ \(n,t) -> do 44 unisAndSetters <- forM l $ \(n,t) -> do
44 (uni, setter) <- mkUniformSetter t 45 (uni, setter) <- mkUniformSetter t
45 return ((n,uni),(n,setter)) 46 return ((n,uni),(fromString n,setter))
46 let (unis,setters) = unzip unisAndSetters 47 let (unis,setters) = unzip unisAndSetters
47 return (Map.fromList setters, Map.fromList unis) 48 return (Map.fromList setters, Map.fromList unis)
48 49
diff --git a/src/LambdaCube/GL/Type.hs b/src/LambdaCube/GL/Type.hs
index ebd0582..8f4bdd7 100644
--- a/src/LambdaCube/GL/Type.hs
+++ b/src/LambdaCube/GL/Type.hs
@@ -17,7 +17,7 @@ import Graphics.GL.Core33
17import Linear 17import Linear
18import IR 18import IR
19 19
20type GLUniformName = String -- ByteString 20type GLUniformName = ByteString
21 21
22--------------- 22---------------
23-- Input API -- 23-- Input API --