Commit before removing geometry shader from ellipses

src/Shader/Compile.hs

@@ -28,16 +28,15 @@ makeShaderVBO ::
     [GLenum] ->
     -- | The input vertex sizes
     [VertexAttribute] ->
-    PrimitiveMode ->
     IO (Shader, VBO)
-makeShaderVBO s shaderlist sizes pm = do
+makeShaderVBO s shaderlist sizes = do
     prog <- makeSourcedShader s shaderlist
     (vao, vbo) <- setupVBOVAO sizes
     return
         ( Shader
             { _shaderUINT = prog
             , _shaderVAO = vao
-            , _shaderPrimitive = pm
+--            , _shaderPrimitive = pm
             }
         , vbo
         )

src/Shader/Data.hs

@@ -50,7 +50,7 @@ import Graphics.GL.Core45
 -- | Datatype containing the necessary information for a single shader.
 data Shader = Shader
     { _shaderUINT :: GLuint -- should be shaderID
-    , _shaderPrimitive :: PrimitiveMode
+--    , _shaderPrimitive :: PrimitiveMode
     , _shaderVAO :: VAO
     }
 
@@ -104,7 +104,7 @@ newtype ShaderTexture = ShaderTexture
     --    , _textureTarget :: GLenum
     }
 
-newtype PrimitiveMode = PrimitiveMode {_unPrimitiveMode :: GLenum}
+--newtype PrimitiveMode = PrimitiveMode {_unPrimitiveMode :: GLenum}
 
 -- | Short synonyms for shader types
 vert, geom, frag :: GLenum
@@ -112,17 +112,17 @@ vert = GL_VERTEX_SHADER
 geom = GL_GEOMETRY_SHADER
 frag = GL_FRAGMENT_SHADER
 
-pmPoints, pmLines, pmLinesAdjacency, pmLineLoop, pmLineStrip, pmTriangles, pmTriangleStrip, pmTriangleFan, pmQuads, pmPatches :: PrimitiveMode
-pmPoints = PrimitiveMode GL_POINTS
-pmLines = PrimitiveMode GL_LINES
-pmLinesAdjacency = PrimitiveMode GL_LINES_ADJACENCY
-pmLineLoop = PrimitiveMode GL_LINE_LOOP
-pmLineStrip = PrimitiveMode GL_LINE_STRIP
-pmTriangles = PrimitiveMode GL_TRIANGLES
-pmTriangleStrip = PrimitiveMode GL_TRIANGLE_STRIP
-pmTriangleFan = PrimitiveMode GL_TRIANGLE_FAN
-pmQuads = PrimitiveMode GL_QUADS
-pmPatches = PrimitiveMode GL_PATCHES
+--pmPoints, pmLines, pmLinesAdjacency, pmLineLoop, pmLineStrip, pmTriangles, pmTriangleStrip, pmTriangleFan, pmQuads, pmPatches :: PrimitiveMode
+--pmPoints = PrimitiveMode GL_POINTS
+--pmLines = PrimitiveMode GL_LINES
+--pmLinesAdjacency = PrimitiveMode GL_LINES_ADJACENCY
+--pmLineLoop = PrimitiveMode GL_LINE_LOOP
+--pmLineStrip = PrimitiveMode GL_LINE_STRIP
+--pmTriangles = PrimitiveMode GL_TRIANGLES
+--pmTriangleStrip = PrimitiveMode GL_TRIANGLE_STRIP
+--pmTriangleFan = PrimitiveMode GL_TRIANGLE_FAN
+--pmQuads = PrimitiveMode GL_QUADS
+--pmPatches = PrimitiveMode GL_PATCHES
 
 makeLenses ''VAO
 makeLenses ''VBO
@@ -132,5 +132,5 @@ makeLenses ''ShaderTexture
 makeLenses ''Shader
 makeLenses ''FBO
 makeLenses ''TO
-makeLenses ''PrimitiveMode
+--makeLenses ''PrimitiveMode
 makeLenses ''VertexAttribute