Remove RenderType datatype

src/Shader/Compile.hs

@@ -9,7 +9,6 @@ module Shader.Compile
     ) where
 import Shader.Data
 import Shader.Parameters
-import Picture.Data
 
 import Foreign
 import qualified Data.ByteString as BS
@@ -26,9 +25,8 @@ makeVShader
     -> [ShaderType] -- ^ Filetype extensions
     -> [Int]   -- ^ The input vertex sizes
     -> EPrimitiveMode
-    -> (VertexType -> Bool)
     -> IO VShader
-makeVShader s shaderlist sizes renStrat vtest = do
+makeVShader s shaderlist sizes pm = do
     prog <- makeSourcedShader s shaderlist
     vaob <- setupVAO sizes
     return $ VShader 
@@ -36,8 +34,7 @@ makeVShader s shaderlist sizes renStrat vtest = do
         , _vshaderVAO = vaob
         , _vshaderTexture = Nothing
         , _vshaderCustomUnis = []
-        , _vshaderPokeTest = vtest
-        , _vshaderDrawPrimitive = renStrat
+        , _vshaderDrawPrimitive = pm
         }
 
 -- | Takes the VAO and poke strategy from another shader
@@ -64,15 +61,13 @@ makeShader
     -> [ShaderType] -- ^ Filetype extensions
     -> [Int]   -- ^ The input vertex sizes
     -> EPrimitiveMode
-    -> (RenderType -> [[Float]])   -- ^ Poke strategy: method for creating a list of vertex data to be bound
     -> IO FullShader
-makeShader s shaderlist sizes pm renStrat = do
+makeShader s shaderlist sizes pm = do
     prog <- makeSourcedShader s shaderlist
     vaob <- setupVAO sizes
     return $ FullShader 
         { _shaderProgram = prog
         , _shaderVAO = vaob
-        , _shaderPokeStrategy = renStrat
         , _shaderDrawPrimitive = pm
         , _shaderTexture = Nothing
         , _shaderCustomUnis = []
@@ -87,15 +82,13 @@ makeShaderSized
     -> [Int]   -- ^ The input vertex sizes
     -> Int          -- ^ Number of vertexes that can be poked
     -> EPrimitiveMode
-    -> (RenderType -> [[Float]])   -- ^ Poke strategy: method for creating a list of vertex data to be bound
     -> IO FullShader
-makeShaderSized s shaderlist sizes ndraw pm renStrat = do
+makeShaderSized s shaderlist sizes ndraw pm = do
     prog <- makeSourcedShader s shaderlist
     vaob <- setupVAOSized sizes ndraw
     return $ FullShader 
         { _shaderProgram = prog
         , _shaderVAO = vaob
-        , _shaderPokeStrategy = renStrat
         , _shaderDrawPrimitive = pm
         , _shaderTexture = Nothing
         , _shaderCustomUnis = []