Simplify shader records

src/Dodge/Render.hs

@@ -121,13 +121,10 @@ doDrawing' win pdata u = do
     glEnable GL_CULL_FACE
     glCullFace GL_BACK
     unless (debugOn Remove_LOS cfig) $ do
-        glUseProgram (pdata ^. ceilingStencilShader . shaderUINT)
+        glUseProgram (pdata ^. ceilingStencilShader)
         glBindVertexArray $ pdata ^. dummyVAO . vaoName
         glEnable GL_DEPTH_CLAMP
-        glDrawArrays
-            (_unPrimitiveMode $ pdata ^. ceilingStencilShader . shaderPrimitive)
-            0
-            (fromIntegral (trueNWalls * 6))
+        glDrawArrays GL_TRIANGLES 0 (fromIntegral (trueNWalls * 6))
         glDisable GL_DEPTH_CLAMP
     glStencilMask 127 -- to alter last seven bits
     glStencilOp GL_KEEP GL_KEEP GL_KEEP
@@ -152,7 +149,7 @@ doDrawing' win pdata u = do
     glDrawArrays GL_TRIANGLES 0 (fromIntegral trueNWalls * 6)
     --draw object shapes onto base buffer
     let fs = _shapeShader pdata
-    glUseProgram (_shaderUINT fs)
+    glUseProgram fs
     glDrawArrays GL_TRIANGLES 0 (fromIntegral nIndices)
     -- draw chasm shader blocking floor
     glUseProgram (pdata ^. chasmShader . shaderUINT)
@@ -226,15 +223,8 @@ doDrawing' win pdata u = do
     -- rethought, either do another pass and write just the depth or even remove
     -- the layer entirely
     glBlendFuncSeparate GL_ZERO GL_ONE GL_CONSTANT_ALPHA GL_ONE_MINUS_SRC_ALPHA
-    glUseProgram (pdata ^. cloudShader . shaderUINT)
-    glBindVertexArray $ pdata ^. cloudShader . shaderVAO . vaoName
+    glUseProgram (pdata ^. cloudShader)
     glDrawArrays GL_TRIANGLES 0 (fromIntegral nCloudVs * 6)
-    --glDrawArrays GL_TRIANGLES 0 6
-    --    glDrawElements
-    --        (pdata ^. cloudShader . shaderPrimitive . unPrimitiveMode)
-    --        (fromIntegral nCloudIs)
-    --        GL_UNSIGNED_INT
-    --        nullPtr
     glDepthMask GL_TRUE
 
     --setup downscale viewport for blurring bloom
@@ -275,15 +265,8 @@ doDrawing' win pdata u = do
             (pdata ^. fboCloud . _1 . unFBO)
             GL_COLOR
             0
-    glUseProgram (pdata ^. cloudShader . shaderUINT)
-    glBindVertexArray $ pdata ^. cloudShader . shaderVAO . vaoName
+    glUseProgram (pdata ^. cloudShader)
     glDrawArrays GL_TRIANGLES 0 (fromIntegral nCloudVs * 6)
-    --glDrawArrays GL_TRIANGLES 0 6
-    ----    glDrawElements
-    ----        (pdata ^. cloudShader . shaderPrimitive . unPrimitiveMode)
-    ----        (fromIntegral nCloudIs)
-    ----        GL_UNSIGNED_INT
-    ----        nullPtr
     --    glEnable GL_CULL_FACE
     --    glEnable GL_DEPTH_CLAMP
     --    glCullFace GL_BACK
@@ -308,8 +291,7 @@ doDrawing' win pdata u = do
         -- and sum the normals weighted by alpha
         --glBlendFunci 2 GL_SRC_ALPHA GL_ONE
         glBlendFunci 2 GL_SRC_ALPHA GL_ONE
-        glUseProgram (pdata ^. cloudShader . shaderUINT)
-        glBindVertexArray $ pdata ^. cloudShader . shaderVAO . vaoName
+        glUseProgram (pdata ^. cloudShader)
         --        glDepthMask GL_TRUE
         glDrawArrays GL_TRIANGLES 0 (fromIntegral nCloudVs * 6)
         --glDrawArrays GL_TRIANGLES 0 6