Start cleanup of shader records

src/Preload/Render.hs

@@ -95,8 +95,7 @@ preloadRender = do
     cloudshader <- makeShaderUsingVAO "pull/cloud" [vert, frag] pmTriangles (VAO dummyvao)
 
     putStrLn "Setup lighting shaders"
-    lightingWallShadShad <-
-        makeShaderUsingVAO "lighting/wallShadow" [vert] pmTriangles (VAO dummyvao)
+    shadwallshader <- makeSourcedShader "lighting/wallShadow" [vert]
     lightingCapShad <-
         makeShaderUsingVAO "lighting/cap" [vert] pmTriangles (VAO dummyvao)
     lightingLineShadowShad <-
@@ -199,10 +198,9 @@ preloadRender = do
             , _silhouetteEBO = UintBO ieshapessbo ieptr
             , _lightingCapShader = lightingCapShad
             , _lightingLineShadowShader = lightingLineShadowShad
-            , _lightingWallShadShader = lightingWallShadShad
+            , _shadWallShader = shadwallshader
             , _ceilingStencilShader = ceilingstencilshader
-            , --            , _windowShader = windowshader
-              _windowPullShader = winpull
+            , _windowPullShader = winpull
             , _pullWallShader = wallpull
             , _fullscreenShader = fsShad
             , _transparencyCompShader = transcompshader
@@ -224,25 +222,16 @@ preloadRender = do
             , _fboPos = fboPosName
             , _rboBaseBloom = rboBaseBloomName
             , _matUBO = theUBO
-            , --            , _winSSBO = winssbo
-              --            , _wallSSBO = wallssbo
-              --            , _shapeSSBO = shapessbo
-              --            , _ishapeSSBO = ishapessbo
-              --            , _ieshapeSSBO = ieshapessbo
-              --            , _lightsUBO = lightsubo
-              --            , _vboWindows = winvbo
-              _vboShapes = shVBO
+            , _vboShapes = shVBO
             , _floorVBO = floorvbo
             , _floorShader = floorshader
             , _chasmVBO = chasmvbo
             , _chasmShader = chasmshader
             , _wallVBO = wallvbo
             , _winVBO = winvbo
-            , --            , _wallShader = wallshader
-              _cloudVBO = cloudvbo
+            , _cloudVBO = cloudvbo
             , _cloudShader = cloudshader
-            , --            , _cloudEBO = cloudebo
-              _screenTextureVAO = screentexturevao
+            , _screenTextureVAO = screentexturevao
             , _dummyVAO = VAO dummyvao
             }