Simplify shader records

src/Preload/Render.hs

@@ -1,9 +1,6 @@
 --{-# LANGUAGE TemplateHaskell #-}
 --{-# OPTIONS_GHC -Wno-unused-top-binds #-}
-module Preload.Render (
-    preloadRender,
-    --    cleanUpRenderPreload,
-) where
+module Preload.Render (preloadRender) where
 
 import Control.Concurrent
 --import Control.Lens
@@ -95,27 +92,16 @@ preloadRender = do
 
     dummyvao <- mglCreate glGenVertexArrays
 
-    --winpull <- makeShaderUsingVAO "pull/window" [vert, frag] pmTriangles (VAO dummyvao)
     winpull <- makeSourcedShader "pull/window" [vert, frag]
     wallpull <- makeSourcedShader "pull/wall" [vert, frag]
-
-    shapeshader <-
-        makeShaderUsingVAO "shape/basic" [vert, frag] pmTriangles (VAO dummyvao)
-
-    cloudshader <- makeShaderUsingVAO "pull/cloud" [vert, frag] pmTriangles (VAO dummyvao)
+    shapeshader <- makeSourcedShader "shape/basic" [vert, frag]
+    cloudshader <- makeSourcedShader "pull/cloud" [vert, frag]
 
     putStrLn "Setup lighting shaders"
     shadwallshader <- makeSourcedShader "lighting/wallShadow" [vert]
-    lightingCapShad <-
-        makeShaderUsingVAO "lighting/cap" [vert] pmTriangles (VAO dummyvao)
-    lightingLineShadowShad <-
-        makeShaderUsingVAO "lighting/lineShadow" [vert] pmTriangles (VAO dummyvao)
-    ceilingstencilshader <-
-        makeShaderUsingVAO
-            "ceiling/stencil"
-            [vert]
-            pmTriangles
-            (VAO dummyvao)
+    lightingCapShad <- makeSourcedShader "lighting/cap" [vert]
+    lightingLineShadowShad <- makeSourcedShader "lighting/lineShadow" [vert]
+    ceilingstencilshader <- makeSourcedShader "ceiling/stencil" [vert]
 
     putStrLn "Setup 2D shaders"
     bslist <- makeShaderVBO "dualTwoD/basic" [vert, frag] (toFloatVAs [3, 4]) pmTriangles