Cleanup
This commit is contained in:
+2
-15
@@ -41,20 +41,14 @@ preloadRender = do
|
||||
|
||||
winssbo <- mglCreate glCreateBuffers
|
||||
let winssbosize = sizeOf (0::Float) * 8 * 1024
|
||||
-- winssboptr <- mallocBytes winssbosize
|
||||
|
||||
glNamedBufferStorage winssbo (fromIntegral winssbosize) nullPtr GL_DYNAMIC_STORAGE_BIT
|
||||
glBindBufferBase GL_SHADER_STORAGE_BUFFER 1 winssbo
|
||||
|
||||
--dummyvao <- mglCreate glCreateVertexArrays
|
||||
dummyvao <- mglCreate glGenVertexArrays
|
||||
|
||||
winpull <- makeShaderUsingVAO "pull/window" [vert,frag] pmTriangles (VAO dummyvao)
|
||||
|
||||
-- lightsubo <- mglCreate glCreateBuffers
|
||||
-- --glNamedBufferData lightsubo 640 nullPtr GL_STREAM_DRAW
|
||||
-- glNamedBufferStorage lightsubo 640 nullPtr GL_DYNAMIC_STORAGE_BIT
|
||||
-- glBindBufferBase GL_UNIFORM_BUFFER 1 lightsubo
|
||||
|
||||
-- setup shape geometry/cap VBO and two VAOs
|
||||
putStrLn "Setup shape VBO, VAO, EBO"
|
||||
shVBO <- setupVBO shapeVerxSize
|
||||
@@ -80,13 +74,6 @@ preloadRender = do
|
||||
let wallverxstrd = 8
|
||||
wallvbo <- setupVBO (floatSize * wallverxstrd)
|
||||
winvbo <- setupVBO (floatSize * 8)
|
||||
windowshader <-
|
||||
makeShaderUsingVBO
|
||||
"wall/window"
|
||||
[vert, geom, frag]
|
||||
(toFloatVAs [4, 4])
|
||||
pmPoints
|
||||
winvbo
|
||||
wallshader <- makeShaderUsingVBO "wall/basic" [vert, geom, frag] (toFloatVAs [4, 4]) pmPoints wallvbo
|
||||
putStrLn "Setup lighting shaders"
|
||||
lightingWallShadShad <-
|
||||
@@ -193,7 +180,7 @@ preloadRender = do
|
||||
, _lightingLineShadowShader = lightingLineShadowShad
|
||||
, _lightingWallShadShader = lightingWallShadShad
|
||||
, _ceilingStencilShader = ceilingstencilshader
|
||||
, _windowShader = windowshader
|
||||
-- , _windowShader = windowshader
|
||||
, _windowPullShader = winpull
|
||||
, _fullscreenShader = fsShad
|
||||
, _transparencyCompShader = transcompshader
|
||||
|
||||
Reference in New Issue
Block a user