From 2cffe81b754f5555bad0c3ae63362ae90747ce70 Mon Sep 17 00:00:00 2001 From: justin Date: Sun, 23 Nov 2025 11:00:47 +0000 Subject: [PATCH] Slightly restrict texture sizes --- shader/shape/basic.frag | 8 ++++---- src/Data/Preload/Render.hs | 1 - src/Dodge/Render.hs | 2 +- src/Framebuffer/Update.hs | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/shader/shape/basic.frag b/shader/shape/basic.frag index 1b55a92be..c672dd6d8 100644 --- a/shader/shape/basic.frag +++ b/shader/shape/basic.frag @@ -3,11 +3,11 @@ in vec4 vCol; in vec4 vPos; in vec4 vNorm; layout (location=0) out vec4 fCol; -layout (location=1) out vec4 fPos; -layout (location=2) out vec4 fNorm; +layout (location=1) out vec3 fPos; +layout (location=2) out vec3 fNorm; void main() { fCol = vCol; - fPos = vPos; - fNorm = vNorm; + fPos = vPos.xyz; + fNorm = vNorm.xyz; } diff --git a/src/Data/Preload/Render.hs b/src/Data/Preload/Render.hs index c72bb6288..915ce7ac3 100644 --- a/src/Data/Preload/Render.hs +++ b/src/Data/Preload/Render.hs @@ -27,7 +27,6 @@ data RenderData = RenderData , _shapeEBO :: UintBO , _silhouetteEBO :: UintBO , _pictureShaders :: MV.MVector (PrimState IO) (GLuint,VBO) --- , _fbo2 :: (FBO, TO) , _fboHalf1 :: (FBO, TO) , _fboHalf2 :: (FBO, TO) , _fboBase :: (FBO, (TO, TO, TO)) diff --git a/src/Dodge/Render.hs b/src/Dodge/Render.hs index d32638e8d..53722d8c2 100644 --- a/src/Dodge/Render.hs +++ b/src/Dodge/Render.hs @@ -318,7 +318,7 @@ doDrawing' win pdata u = do glEnable GL_CULL_FACE glDisable GL_DEPTH_CLAMP --apply lightmap to cloud buffer - glBindFramebuffer GL_FRAMEBUFFER (_unFBO (fst (_fboCloud pdata))) + glBindFramebuffer GL_FRAMEBUFFER $ pdata ^. fboCloud . _1 . unFBO glDepthMask GL_FALSE withArray [GL_COLOR_ATTACHMENT0, GL_NONE] $ glNamedFramebufferDrawBuffers (pdata ^. fboCloud . _1 . unFBO) 2 diff --git a/src/Framebuffer/Update.hs b/src/Framebuffer/Update.hs index cdc2b2e37..d46ca26f9 100644 --- a/src/Framebuffer/Update.hs +++ b/src/Framebuffer/Update.hs @@ -26,10 +26,10 @@ sizeFBOs cfig rdata = GL_NEAREST GL_NEAREST GL_RGBA16F - GL_RGBA16F -- could possibly recover using depth in a clever way + GL_RGB16F -- could possibly recover using depth in a clever way -- but probably not, because the projection matrix is -- not always on-center - GL_RGBA8_SNORM + GL_RGB8_SNORM rdata fboBase >>= flip