Slightly restrict texture sizes

This commit is contained in:
2025-11-23 11:00:47 +00:00
parent 74c02291c1
commit 2cffe81b75
4 changed files with 7 additions and 8 deletions
+4 -4
View File
@@ -3,11 +3,11 @@ in vec4 vCol;
in vec4 vPos; in vec4 vPos;
in vec4 vNorm; in vec4 vNorm;
layout (location=0) out vec4 fCol; layout (location=0) out vec4 fCol;
layout (location=1) out vec4 fPos; layout (location=1) out vec3 fPos;
layout (location=2) out vec4 fNorm; layout (location=2) out vec3 fNorm;
void main() void main()
{ {
fCol = vCol; fCol = vCol;
fPos = vPos; fPos = vPos.xyz;
fNorm = vNorm; fNorm = vNorm.xyz;
} }
-1
View File
@@ -27,7 +27,6 @@ data RenderData = RenderData
, _shapeEBO :: UintBO , _shapeEBO :: UintBO
, _silhouetteEBO :: UintBO , _silhouetteEBO :: UintBO
, _pictureShaders :: MV.MVector (PrimState IO) (GLuint,VBO) , _pictureShaders :: MV.MVector (PrimState IO) (GLuint,VBO)
-- , _fbo2 :: (FBO, TO)
, _fboHalf1 :: (FBO, TO) , _fboHalf1 :: (FBO, TO)
, _fboHalf2 :: (FBO, TO) , _fboHalf2 :: (FBO, TO)
, _fboBase :: (FBO, (TO, TO, TO)) , _fboBase :: (FBO, (TO, TO, TO))
+1 -1
View File
@@ -318,7 +318,7 @@ doDrawing' win pdata u = do
glEnable GL_CULL_FACE glEnable GL_CULL_FACE
glDisable GL_DEPTH_CLAMP glDisable GL_DEPTH_CLAMP
--apply lightmap to cloud buffer --apply lightmap to cloud buffer
glBindFramebuffer GL_FRAMEBUFFER (_unFBO (fst (_fboCloud pdata))) glBindFramebuffer GL_FRAMEBUFFER $ pdata ^. fboCloud . _1 . unFBO
glDepthMask GL_FALSE glDepthMask GL_FALSE
withArray [GL_COLOR_ATTACHMENT0, GL_NONE] $ withArray [GL_COLOR_ATTACHMENT0, GL_NONE] $
glNamedFramebufferDrawBuffers (pdata ^. fboCloud . _1 . unFBO) 2 glNamedFramebufferDrawBuffers (pdata ^. fboCloud . _1 . unFBO) 2
+2 -2
View File
@@ -26,10 +26,10 @@ sizeFBOs cfig rdata =
GL_NEAREST GL_NEAREST
GL_NEAREST GL_NEAREST
GL_RGBA16F 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 -- but probably not, because the projection matrix is
-- not always on-center -- not always on-center
GL_RGBA8_SNORM GL_RGB8_SNORM
rdata rdata
fboBase fboBase
>>= flip >>= flip