Cleanup some silhouette edge buffers
This commit is contained in:
@@ -62,6 +62,7 @@ preloadRender = do
|
||||
let ieshapessbosize = fromIntegral (sizeOf (0::GLuint) * 65536)
|
||||
glNamedBufferStorage ieshapessbo ieshapessbosize nullPtr GL_DYNAMIC_STORAGE_BIT
|
||||
glBindBufferBase GL_SHADER_STORAGE_BUFFER 5 ieshapessbo
|
||||
ieptr <- mallocArray 65536 -- so we can go back to glushort...
|
||||
|
||||
dummyvao <- mglCreate glGenVertexArrays
|
||||
|
||||
@@ -83,12 +84,12 @@ preloadRender = do
|
||||
shapeVerxAttributes
|
||||
pmTriangles
|
||||
shVBO
|
||||
glVertexArrayElementBuffer (shapeshader ^. shaderVAO . vaoName) (shEBO ^. eboName)
|
||||
glVertexArrayElementBuffer (shapeshader ^. shaderVAO . vaoName) (shEBO ^. uiboName)
|
||||
|
||||
--setup silhouette edge VAO
|
||||
putStrLn "Setup silhouette VAO, EBO"
|
||||
shedgevao <- setupVAOUsingVBO [VertexAttribute 4 GL_FLOAT GL_FALSE 0] shVBO
|
||||
shedgeebo <- setupEBO shedgevao
|
||||
-- putStrLn "Setup silhouette VAO, EBO"
|
||||
-- shedgevao <- setupVAOUsingVBO [VertexAttribute 4 GL_FLOAT GL_FALSE 0] shVBO
|
||||
-- shedgeebo <- setupEBO shedgevao
|
||||
|
||||
putStrLn "Setup wall/windows VBO, VAO, EBO, shader"
|
||||
let wallverxstrd = 8
|
||||
@@ -104,7 +105,7 @@ preloadRender = do
|
||||
makeShaderUsingVAO "lighting/cap" [vert] pmTriangles (VAO dummyvao)
|
||||
lightingLineShadowShad <-
|
||||
--makeShaderUsingVAO "lighting/lineShadow" [vert, geom] pmLinesAdjacency shedgevao
|
||||
makeShaderUsingVAO "lighting/lineShadow" [vert] pmTriangles shedgevao
|
||||
makeShaderUsingVAO "lighting/lineShadow" [vert] pmTriangles (VAO dummyvao)
|
||||
|
||||
ceilingstencilshader <- makeShaderUsingVAO "ceiling/stencil" [vert] pmTriangles
|
||||
(VAO dummyvao)
|
||||
@@ -200,7 +201,7 @@ preloadRender = do
|
||||
{ _pictureShaders = shadV
|
||||
, _shapeShader = shapeshader -- & shaderVAO' .~ shPosColVAO
|
||||
, _shapeEBO = shEBO
|
||||
, _silhouetteEBO = shedgeebo
|
||||
, _silhouetteEBO = UintBO ieshapessbo ieptr
|
||||
, _lightingCapShader = lightingCapShad
|
||||
, _lightingLineShadowShader = lightingLineShadowShad
|
||||
, _lightingWallShadShader = lightingWallShadShad
|
||||
@@ -232,7 +233,7 @@ preloadRender = do
|
||||
, _wallSSBO = wallssbo
|
||||
, _shapeSSBO = shapessbo
|
||||
, _ishapeSSBO = ishapessbo
|
||||
, _ieshapeSSBO = ieshapessbo
|
||||
-- , _ieshapeSSBO = ieshapessbo
|
||||
-- , _lightsUBO = lightsubo
|
||||
, _vboWindows = winvbo
|
||||
, _vboShapes = shVBO
|
||||
|
||||
Reference in New Issue
Block a user