Cleanup

src/Shader.hs

@@ -1,6 +1,5 @@
 module Shader
-    ( freeShaderPointers
+    ( freeShaderPointers'
-    , freeShaderPointers'
     , drawShaderLay
     , shadVBOptr
     , shadVBOptr'
@@ -57,9 +56,6 @@ drawShader fs i = do
         0 
         (fromIntegral i)
 
-freeShaderPointers :: FullShader -> IO ()
-freeShaderPointers = free . _vboPtr . _vaoVBO . _shadVAO
-
 freeShaderPointers' :: FullShader' -> IO ()
 freeShaderPointers' = free . _vboPtr . _vaoVBO . _shadVAO'
 

src/Shader/Data.hs

@@ -5,18 +5,13 @@ module Shader.Data
     ( VAO (..)
     , VBO (..)
     , EBO (..)
-    , FullShader (..)
+--    , FullShader (..)
     , FullShader' (..)
     , ShaderTexture (..)
     , EPrimitiveMode (..)
 -- | Lens functions
     , vaoName
     , vaoVBO
-    , shadProg
-    , shadVAO
-    , shadPrim
-    , shadTex
-    , shadUnis
     , vbo
     , vboPtr
     , vboAttribSizes
@@ -30,9 +25,6 @@ module Shader.Data
     , shadTex'
     , shadUnis'
 -- | Synonyms
-    , vert
-    , geom
-    , frag
     , vert'
     , geom'
     , frag'
@@ -43,13 +35,6 @@ import Graphics.GL.Core43
 import Foreign
 import Control.Lens
 {- | Datatype containing the necessary information for a single shader.  -}
-data FullShader = FullShader
-    { _shadProg :: Program
-    , _shadVAO  :: VAO
-    , _shadPrim :: EPrimitiveMode
-    , _shadTex  :: Maybe ShaderTexture
-    , _shadUnis :: Vector UniformLocation
-    }
 data FullShader' = FullShader'
     { _shadProg' :: GLuint -- should be shaderID
     , _shadVAO'  :: VAO
@@ -96,16 +81,11 @@ data EPrimitiveMode
     | EPolygon
     | EPatches
 -- | Short synonyms for shader types
-vert, geom, frag :: ShaderType
-vert = VertexShader
-geom = GeometryShader
-frag = FragmentShader
 vert', geom', frag' :: GLenum
 vert' = GL_VERTEX_SHADER
 geom' = GL_GEOMETRY_SHADER
 frag' = GL_FRAGMENT_SHADER
 makeLenses ''VAO
 makeLenses ''VBO
-makeLenses ''FullShader
 makeLenses ''FullShader'
 makeLenses ''EBO