Enable float/int casts for non-WebGL target.

1 files changed, 13 insertions, 7 deletions

diff --git a/src/LambdaCube/Compiler/CoreToIR.hs b/src/LambdaCube/Compiler/CoreToIR.hs
index 45bfa1ad..30353129 100644
--- a/src/LambdaCube/Compiler/CoreToIR.hs
+++ b/src/LambdaCube/Compiler/CoreToIR.hs
@@ -724,7 +724,7 @@ genGLSLs backend
         | null fsa = return (us, fsb)
         | otherwise = do
             (unzip -> (defs, unzip -> (us', fs'))) <- forM fsa $ \(fn, (def, ty, tys)) ->
-                runWriterT $ genGLSL (reverse $ take (length tys) funArgs) $ removeLams (length tys) def
+                runWriterT $ genGLSL backend (reverse $ take (length tys) funArgs) $ removeLams (length tys) def
             let fsb' = mconcat (zipWith combine fsa defs) <> fsb
                 ns' = ns <> Set.fromList (map fst fsa)
             fixFuncs (us <> mconcat us') ns' fsb' (mconcat fs' `Map.difference` Map.fromSet (const undefined) ns')
@@ -753,7 +753,7 @@ genGLSLs backend
     reds (etaReds -> Just (ps, o)) = (ps, o)
     reds x = error $ "red: " ++ ppShow x
     genGLSL' err vertOuts (ps, o)
-        | length ps == length vertOuts = genGLSL (reverse vertOuts) o
+        | length ps == length vertOuts = genGLSL backend (reverse vertOuts) o
         | otherwise = error $ "makeSubst illegal input " ++ err ++ "  " ++ ppShow ps ++ "\n" ++ ppShow vertOuts
 
     noUnit TTuple0 = False
@@ -814,8 +814,8 @@ simpleExpr = \case
         _ -> False
     _ -> False
 
-genGLSL :: [SName] -> ExpTV -> WriterT (Uniforms, Map.Map SName (ExpTV, ExpTV, [ExpTV])) (State [String]) Doc
-genGLSL dns e = case e of
+genGLSL :: Backend -> [SName] -> ExpTV -> WriterT (Uniforms, Map.Map SName (ExpTV, ExpTV, [ExpTV])) (State [String]) Doc
+genGLSL backend dns e = case e of
 
   ELit a -> pure $ pShow a
   Var i _ -> pure $ text $ dns !! i
@@ -948,12 +948,18 @@ genGLSL dns e = case e of
             _ -> ""
 
     -- not supported
-    n | n `elem` ["primIntToWord", "primIntToFloat", "primCompareInt", "primCompareWord", "primCompareFloat"] -> error $ "WebGL 1 does not support: " ++ ppShow e
-    n | n `elem` ["M23F", "M24F", "M32F", "M34F", "M42F", "M43F"] -> error "WebGL 1 does not support matrices with this dimension"
+    n | isWebGL && n `elem` ["primIntToWord", "primIntToFloat", "primCompareInt", "primCompareWord", "primCompareFloat"] -> error $ "WebGL 1 does not support: " ++ ppShow e
+    n | isWebGL && n `elem` ["M23F", "M24F", "M32F", "M34F", "M42F", "M43F"] -> error "WebGL 1 does not support matrices with this dimension"
+
+    "primIntToFloat" -> call "float" xs
+
     x -> error $ "GLSL codegen - unsupported function: " ++ ppShow x
 
   x -> error $ "GLSL codegen - unsupported expression: " ++ ppShow x
   where
+    isWebGL = case backend of WebGL1 -> True
+                              _      -> False
+
     newName = gets head <* modify tail
 
     call f xs = case f of
@@ -963,7 +969,7 @@ genGLSL dns e = case e of
       [op, '_'] -> case xs of [a] -> (text [op] <+>) . parens <$> gen a
       o         -> case xs of [a, b] -> hsep <$> sequence [parens <$> gen a, pure $ text o, parens <$> gen b]
 
-    gen = genGLSL dns
+    gen = genGLSL backend dns
 
     isMatrix :: Ty -> Bool
     isMatrix TMat{} = True