Free vao pointers at end

This commit is contained in:
jgk
2021-03-11 19:42:29 +01:00
parent 33017a599b
commit 2d995339b9
2 changed files with 5 additions and 22 deletions
+4 -7
View File
@@ -107,8 +107,6 @@ preloadRender = do
return $ RenderData
{ _textures = [dirttex,dirttex]
, _listShaders = [bslist,lslist,cslist,aslist,eslist]
-- , _lightmapCircleShader = fcs
, _backVAO = backgroundvao
, _dummyVBO = dummyvbo
, _dummyPtr = dummyptr
, _lightSourceShader = lsShad
@@ -121,9 +119,8 @@ vaoPointers = (\(_,ps,_) -> ps) . unzip3 . _vaoBufferTargets
cleanUpRenderPreload :: RenderData -> IO ()
cleanUpRenderPreload pd = do
-- mapM_ free $ vaoPointers $ _triVAO pd
-- mapM_ free $ vaoPointers $ _textVAO pd
-- mapM_ free $ vaoPointers $ _circVAO pd
-- mapM_ free $ vaoPointers $ _arcVAO pd
-- mapM_ free $ vaoPointers $ _lineVAO pd
mapM_ freeShaderPointers $ _listShaders pd
freeShaderPointers $ _lightSourceShader pd
freeShaderPointers $ _wallShadowShader pd
freeShaderPointers $ _backgroundShader pd
free $ _dummyPtr pd
+1 -15
View File
@@ -11,11 +11,6 @@ import Shader
import Control.Lens
import Control.Monad
import qualified Control.Applicative as Ap
import Linear.Matrix
import Linear.V4
import qualified Control.Foldl as F
import Data.Bifunctor
@@ -28,22 +23,13 @@ import Picture.Preload
import Foreign hiding (rotate)
import Codec.Picture
import Graphics.GL.Core43
import Graphics.Rendering.OpenGL hiding (Line,translate,scale,imageHeight,imageWidth,Polygon,Color,T)
import qualified Graphics.Rendering.OpenGL as GL
import Data.Foldable
import Data.List
import Data.Maybe (fromJust)
--import qualified Data.Vector.Storable as V
import qualified Data.IntMap as IM
--import qualified Data.DList as DL
--import Control.DeepSeq
import qualified Data.IntMap.Strict as IM
import qualified SDL as SDL