diff options
Diffstat (limited to 'src/LambdaCube/GL')
-rw-r--r-- | src/LambdaCube/GL/Input.hs | 3 | ||||
-rw-r--r-- | src/LambdaCube/GL/Type.hs | 2 |
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) | |||
8 | import Data.IntMap (IntMap) | 8 | import Data.IntMap (IntMap) |
9 | import Data.Vector (Vector,(//),(!)) | 9 | import Data.Vector (Vector,(//),(!)) |
10 | import Data.Word | 10 | import Data.Word |
11 | import Data.String | ||
11 | import Foreign | 12 | import Foreign |
12 | import qualified Data.IntMap as IM | 13 | import qualified Data.IntMap as IM |
13 | import qualified Data.Set as S | 14 | import qualified Data.Set as S |
@@ -42,7 +43,7 @@ mkUniform :: [(String,InputType)] -> IO (Map GLUniformName InputSetter, Map Stri | |||
42 | mkUniform l = do | 43 | mkUniform 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 | |||
17 | import Linear | 17 | import Linear |
18 | import IR | 18 | import IR |
19 | 19 | ||
20 | type GLUniformName = String -- ByteString | 20 | type GLUniformName = ByteString |
21 | 21 | ||
22 | --------------- | 22 | --------------- |
23 | -- Input API -- | 23 | -- Input API -- |