From 6b23454dd1f1c2faf6cf1375350859755d077a13 Mon Sep 17 00:00:00 2001 From: Csaba Hruska Date: Sun, 6 Mar 2016 22:41:35 +0100 Subject: cleanup --- src/LambdaCube/GL/Input.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/LambdaCube/GL/Input.hs') diff --git a/src/LambdaCube/GL/Input.hs b/src/LambdaCube/GL/Input.hs index 9ceb35f..0471a57 100644 --- a/src/LambdaCube/GL/Input.hs +++ b/src/LambdaCube/GL/Input.hs @@ -78,15 +78,15 @@ addObject :: GLStorage -> String -> Primitive -> Maybe (IndexStream Buffer) -> M addObject input slotName prim indices attribs uniformNames = do let sch = schema input forM_ uniformNames $ \n -> case Map.lookup n (uniforms sch) of - Nothing -> throw $ userError $ "Unknown uniform: " ++ show n + Nothing -> fail $ "Unknown uniform: " ++ show n _ -> return () case Map.lookup slotName (objectArrays sch) of - Nothing -> throw $ userError $ "Unknown slot: " ++ show slotName + Nothing -> fail $ "Unknown slot: " ++ show slotName Just (ObjectArraySchema sPrim sAttrs) -> do - when (sPrim /= (primitiveToFetchPrimitive prim)) $ throw $ userError $ + when (sPrim /= (primitiveToFetchPrimitive prim)) $ fail $ "Primitive mismatch for slot (" ++ show slotName ++ ") expected " ++ show sPrim ++ " but got " ++ show prim let sType = fmap streamToStreamType attribs - when (sType /= sAttrs) $ throw $ userError $ unlines $ + when (sType /= sAttrs) $ fail $ unlines $ [ "Attribute stream mismatch for slot (" ++ show slotName ++ ") expected " , show sAttrs , " but got " -- cgit v1.2.3