Reduce rendertype down to vertex information

src/Shader.hs

@@ -42,26 +42,26 @@ bindArrayBuffersLayer numVs lay theVBO = do
   where
     stride = sum $ _vboAttribSizes theVBO
 
-bindShaderLayer :: [(Int,FullShader)] -> [Int] -> IO ()
+bindShaderLayer :: [(Int,VShader)] -> [Int] -> IO ()
 bindShaderLayer = zipWithM_ f
   where 
-    f (l,fs) i = bindArrayBuffersLayer i l $ _vaoVBO $ _shaderVAO fs
+    f (l,fs) i = bindArrayBuffersLayer i l $ _vaoVBO $ _vshaderVAO fs
 
 bindShaderBuffers :: [FullShader] -> [Int] -> IO ()
 bindShaderBuffers = zipWithM_ f
   where 
     f fs i = bindArrayBuffers i $ _vaoVBO $ _shaderVAO fs
 
-drawShaderLay :: Int -> FullShader -> Int -> IO ()
+drawShaderLay :: Int -> VShader -> Int -> IO ()
 {-# INLINE drawShaderLay #-}
 drawShaderLay l fs i = do 
-    currentProgram $= Just (_shaderProgram fs)
-    bindVertexArrayObject $= Just (_vao $ _shaderVAO fs)
-    case _shaderTexture fs of 
+    currentProgram $= Just (_vshaderProgram fs)
+    bindVertexArrayObject $= Just (_vao $ _vshaderVAO fs)
+    case _vshaderTexture fs of 
         Just ShaderTexture{_textureObject = txo}
             -> textureBinding Texture2D $= Just txo
         _   -> return ()
-    glDrawArrays (marshalEPrimitiveMode $ _shaderDrawPrimitive fs) (fromIntegral $ l*numSubElements) (fromIntegral i)
+    glDrawArrays (marshalEPrimitiveMode $ _vshaderDrawPrimitive fs) (fromIntegral $ l*numSubElements) (fromIntegral i)
 
 drawShader :: FullShader -> Int -> IO ()
 {-# INLINE drawShader #-}