1 files changed, 7 insertions, 9 deletions

diff --git a/src/LambdaCube/GL/Input.hs b/src/LambdaCube/GL/Input.hs
index bd46fe0..d63fe69 100644
--- a/src/LambdaCube/GL/Input.hs
+++ b/src/LambdaCube/GL/Input.hs
@@ -226,7 +226,7 @@ createObjectCommands texUnitMap topUnis obj prg = objUniCmds ++ objStreamCmds ++
                   , let texUnit = Map.findWithDefault (error $ "internal error (createObjectCommands - Texture Unit): " ++ show n) n texUnitMap
                   ]
         uniInputType (GLTypedUniform ty _) = unwitnessType ty
-        uniInputType (GLUniform ty _)      = ty
+        uniInputType (GLUniform r)         = objectType r
 
     -- object attribute stream commands
     objStreamCmds = [attrCmd i s | (i,name) <- Map.elems attrMap, let s = fromMaybe (error $ "missing attribute: " ++ name) $ Map.lookup name objAttrs]
@@ -288,16 +288,14 @@ name @= val = do
                 Nothing -> do
                     tell [throwIO $ typeMismatch ty ref]
 
-        GLUniform FTexture2D ref -> case withTypes val ref <$> eqT of
+        GLUniform ref -> case withTypes val ref <$> eqT of
             Just Refl -> tell [val >>= writeIORef ref]
-            Nothing -> tell [ Prelude.putStrLn $ "WARNING: Texture2D variable "
+            Nothing -> tell [ Prelude.putStrLn $ "WARNING: "++show (objectType ref)++" variable "
                                                  ++ show name
                                                  ++ " cannot recieve value " ++ show (typeRep val)
                             , throwIO $ typeMismatch ref val
                             ]
 
-        GLUniform ty _ -> tell [Prelude.putStrLn $ "WARNING: unknown uniform: " ++ show name ++ " :: " ++ show ty]
-
 
 updateUniforms :: GLStorage -> UniM a -> IO ()
 updateUniforms storage (UniM m) = sequence_ l where
@@ -325,11 +323,11 @@ setGLUniform resolv name u val = case u of
                                           , "to", show (typeOf val)
                                           , "value." ]
 
-        GLUniform textureType ref -> case withTypes (Just val) ref <$> eqT of
+        GLUniform ref -> case withTypes (Just val) ref <$> eqT of
             Just Refl -> writeIORef ref val
-            Nothing -> warn $ unwords [ show textureType
-                                      , "uniform", name
-                                      , "only accepts values of type TextureData." ]
+            Nothing -> warn $ unwords [ "uniform", name
+                                      , "only accepts values of type"
+                                      , show $ typeRep ref ]
     where warn s = putStrLn $ "WARNING: " ++ s
 
 -- | Lookup and set a Uniform ref.