justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Some removal of unused framebuffers, partial fix debug layer

Browse Source
This commit is contained in:
justin
2023-04-11 19:44:45 +01:00
parent 33a6e471ae
commit b80241f10e
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Data/Preload/Render.hs
-1
View File
@@ -36,7 +36,6 @@ data RenderData = RenderData
, _fbo3 :: (FBO, TO) , _fbo3 :: (FBO, TO)
, _fboHalf1 :: (FBO, TO) , _fboHalf1 :: (FBO, TO)
, _fboHalf2 :: (FBO, TO) , _fboHalf2 :: (FBO, TO)
, _fboHalf3 :: (FBO, TO)
, _fboBase :: (FBO, (TO, TO, TO)) , _fboBase :: (FBO, (TO, TO, TO))
, _fboCloud :: (FBO, (TO, TO, TO)) , _fboCloud :: (FBO, (TO, TO, TO))
, _fboBloom :: (FBO, TO) , _fboBloom :: (FBO, TO)
src/Dodge/Render.hs
+1 -1
View File
@@ -107,7 +107,6 @@ doDrawing' win pdata u = do
-- set the coordinate uniform ready for drawing elements using world coordinates -- set the coordinate uniform ready for drawing elements using world coordinates
withArray (perspectiveMatrixb rot camzoom trans wins viewFroms) $ \ptr -> withArray (perspectiveMatrixb rot camzoom trans wins viewFroms) $ \ptr ->
glNamedBufferSubData (pdata ^. matUBO) 0 64 ptr glNamedBufferSubData (pdata ^. matUBO) 0 64 ptr
renderLayer DebugLayer shadV layerCounts
setViewport _graphics_world_resolution cfig setViewport _graphics_world_resolution cfig
glBindFramebuffer GL_FRAMEBUFFER (pdata ^. fboBase . _1 . unFBO) glBindFramebuffer GL_FRAMEBUFFER (pdata ^. fboBase . _1 . unFBO)
glDepthMask GL_TRUE glDepthMask GL_TRUE
@@ -366,6 +365,7 @@ doDrawing' win pdata u = do
glDepthMask GL_FALSE glDepthMask GL_FALSE
glEnable GL_BLEND glEnable GL_BLEND
glBlendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA glBlendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
renderLayer DebugLayer shadV layerCounts
glBindBufferBase GL_UNIFORM_BUFFER 0 (pdata ^. matUBO) glBindBufferBase GL_UNIFORM_BUFFER 0 (pdata ^. matUBO)
withArray (scaleMatrix (2 / windowXFloat cfig) (2 / windowYFloat cfig)) withArray (scaleMatrix (2 / windowXFloat cfig) (2 / windowYFloat cfig))
$ \ptr -> glNamedBufferSubData (pdata ^. matUBO) 0 64 ptr $ \ptr -> glNamedBufferSubData (pdata ^. matUBO) 0 64 ptr
src/Framebuffer/Update.hs
+1 -1
View File
@@ -60,7 +60,7 @@ sizeFBOs cfig rdata =
GL_LINEAR_MIPMAP_LINEAR GL_LINEAR_MIPMAP_LINEAR
GL_LINEAR GL_LINEAR
GL_RGBA16F GL_RGBA16F
[fboHalf1, fboHalf2, fboHalf3] [fboHalf1, fboHalf2]
>>= resizeShadowFBO' cfig >>= resizeShadowFBO' cfig
where where
updateFBOTO' f = updateFBOTO' f =
src/Preload/Render.hs
-2
View File
@@ -173,7 +173,6 @@ preloadRender = do
fboHalf1Name <- newTextureFramebuffer fboHalf1Name <- newTextureFramebuffer
fboHalf2Name <- newTextureFramebuffer fboHalf2Name <- newTextureFramebuffer
fboHalf3Name <- newTextureFramebuffer
-- reset to default framebuffer, ready for drawing direct to screen -- reset to default framebuffer, ready for drawing direct to screen
glBindFramebuffer GL_FRAMEBUFFER 0 glBindFramebuffer GL_FRAMEBUFFER 0
@@ -220,7 +219,6 @@ preloadRender = do
, _fbo3 = framebuf3 , _fbo3 = framebuf3
, _fboHalf1 = fboHalf1Name , _fboHalf1 = fboHalf1Name
, _fboHalf2 = fboHalf2Name , _fboHalf2 = fboHalf2Name
, _fboHalf3 = fboHalf3Name
, _fboLighting = fboLightingName , _fboLighting = fboLightingName
, _fboShadow = fboShadowName , _fboShadow = fboShadowName
, _fboBase = fboBaseName , _fboBase = fboBaseName