From 86794d1da9b3ebd83fb2ea8999c16535b99d5641 Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 20 Nov 2025 22:20:53 +0000 Subject: [PATCH] Move towards removing VAOs --- shader/picture/charArray.vert | 12 ++++++------ src/Preload/Render.hs | 6 +++--- tags | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/shader/picture/charArray.vert b/shader/picture/charArray.vert index 297843891..16e7db942 100644 --- a/shader/picture/charArray.vert +++ b/shader/picture/charArray.vert @@ -1,14 +1,14 @@ #version 450 core -layout (location = 0) in vec4 pos; -layout (location = 1) in vec4 inColor; -layout (location = 2) in vec3 inTexCoord; +struct PosColTcoord { vec4 pos; vec4 col; vec4 tcoord; }; +layout (std430, binding = 11) readonly buffer Data { PosColTcoord data[]; }; layout (location = 0) uniform int layoff; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; out vec4 vColor; out vec3 vTexCoord; void main() { - gl_Position = theMat * pos; - vColor = inColor; - vTexCoord = inTexCoord; + vec4 p = data[gl_VertexID].pos; + gl_Position = theMat * p; + vColor = data[gl_VertexID].col; + vTexCoord = data[gl_VertexID].tcoord.xyz; } diff --git a/src/Preload/Render.hs b/src/Preload/Render.hs index f9910f564..d00c52c07 100644 --- a/src/Preload/Render.hs +++ b/src/Preload/Render.hs @@ -104,10 +104,10 @@ preloadRender = do ceilingstencilshader <- makeSourcedShader "ceiling/stencil" [vert] putStrLn "Setup 2D shaders" - bslist <- makeShaderVBO "dualTwoD/basic" [vert, frag] (toFloatVAs [4, 4]) + bslist <- makeShaderVBO "picture/basic" [vert, frag] (toFloatVAs [4, 4]) cslist <- makeShaderVBO "picture/charArray" [vert, frag] (toFloatVAs [4, 4, 4]) - aslist <- makeShaderVBO "dualTwoD/arc" [vert, frag] (toFloatVAs [4, 4, 4]) - eslist <- makeShaderVBO "dualTwoD/ellipse" [vert, frag] (toFloatVAs [4, 4]) + aslist <- makeShaderVBO "picture/arc" [vert, frag] (toFloatVAs [4, 4, 4]) + eslist <- makeShaderVBO "picture/ellipse" [vert, frag] (toFloatVAs [4, 4]) shadV <- MV.new 4 zipWithM_ (MV.write shadV) diff --git a/tags b/tags index 78ebcb817..e392761a2 100644 --- a/tags +++ b/tags @@ -5089,7 +5089,7 @@ terminalWheelEvent src/Dodge/Update/Scroll.hs 131;" f teslaGun src/Dodge/Item/Held/BatteryGuns.hs 19;" f teslaGunPic src/Dodge/Item/Draw/SPic.hs 409;" f teslaParams src/Dodge/Item/Held/BatteryGuns.hs 25;" f -testEvent src/Dodge/Event/Test.hs 10;" f +testEvent src/Dodge/Event/Test.hs 11;" f testInventory src/Dodge/Creature.hs 292;" f testStringInit src/Dodge/TestString.hs 34;" f text src/Picture/Base.hs 193;" f