Unify matrix uniform assignment, move towards uniform block

src/Shader/Compile.hs

@@ -23,7 +23,7 @@ makeShader
     -> [Int]   -- ^ The input vertex sizes
     -> PrimitiveMode
     -> (RenderType -> [[Float]])   -- ^ Poke strategy: method for creating a list of vertex data to be bound
-    -> IO (FullShader)
+    -> IO FullShader
 makeShader s shaderlist sizes pm renStrat = do
     (prog,unis)  <- makeSourcedShader s shaderlist
     vaob        <- setupVAO sizes
@@ -57,7 +57,7 @@ setupVAO :: [Int] -> IO VAO
 setupVAO sizes = do
     theVAO <- genObjectName
     bindVertexArrayObject $= Just theVAO
-    theVBO <- setupVBO $ sizes
+    theVBO <- setupVBO sizes
     return $ VAO 
         { _vao = theVAO
         , _vaoVBO = theVBO