Remove VAOs

src/Shader/Bind.hs

@@ -30,7 +30,7 @@ bufferEBO x i =
     glNamedBufferSubData (x ^. uiboName) 0 (fromIntegral $ gluintSize * i) (x ^. uiboPtr)
 
 bufferShaderLayers 
-    :: MV.MVector (PrimState IO) (Shader, VBO) -> UMV.MVector (PrimState IO) Int -> IO ()
+    :: MV.MVector (PrimState IO) (GLuint, VBO) -> UMV.MVector (PrimState IO) Int -> IO ()
 bufferShaderLayers shads counts = MV.imapM_ f shads
   where
     f i shad = do

src/Shader/Compile.hs

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

src/Shader/Poke.hs

@@ -468,14 +468,14 @@ normalTo8 = over each f . normalize
     f x = floor $ x * 127
 
 pokeLayVerxs ::
-    MV.MVector (PrimState IO) (Shader, VBO) ->
+    MV.MVector (PrimState IO) (GLuint, VBO) ->
     UMV.MVector (PrimState IO) Int ->
     Picture ->
     IO ()
 pokeLayVerxs vbos counts = VFSM.mapM_ (pokeLayVerx vbos counts) . VFSM.fromList
 
 pokeLayVerx 
-    :: MV.MVector (PrimState IO) (Shader, VBO) 
+    :: MV.MVector (PrimState IO) (GLuint, VBO) 
     -> UMV.MVector (PrimState IO) Int 
     -> Verx 
     -> IO ()