Tweak fullscreen texture shaders

src/Picture/Preload.hs

@@ -26,6 +26,7 @@ data RenderData = RenderData
     , _backgroundShader         :: FullShader (Point2,Point2,Point2,Point2)
     , _fullscreenShader         :: FullShader ()
     , _boxBlurShader            :: FullShader ()
+    , _grayscaleShader          :: FullShader ()
     , _pictureShaders           :: [FullShader RenderType]
     , _spareFBO                 :: FramebufferObject
     , _fboTexture               :: TextureObject
@@ -58,22 +59,29 @@ preloadRender = do
                                 [(0,3),(1,4),(2,3)] Points pokeCharStrat
                   >>= addTexture "data/texture/charMap.png"
 
--- fullscreen shader
-    fsShad <- makeShader "fullscreen" [vert,frag] [(0,2),(1,2)] TriangleStrip $ const
+-- texture shaders, no textures attached
+    fsShad <- makeShader "texture/simple" [vert,frag] [(0,2),(1,2)] TriangleStrip $ const
         [[[-1, 1],[0,1]]
         ,[[ 1, 1],[1,1]]
         ,[[-1,-1],[0,0]]
         ,[[ 1,-1],[1,0]]
         ]
     _ <- F.foldM (pokeShader fsShad) [()] -- fix fullscreen vertex positions now
--- box blur shader
-    boxBlurShad <- makeShader "boxBlur" [vert,frag] [(0,2),(1,2)] TriangleStrip $ const
+    boxBlurShad <- makeShader "texture/boxBlur" [vert,frag] [(0,2),(1,2)] TriangleStrip $ const
         [[[-1, 1],[0,1]]
         ,[[ 1, 1],[1,1]]
         ,[[-1,-1],[0,0]]
         ,[[ 1,-1],[1,0]]
         ]
     _ <- F.foldM (pokeShader boxBlurShad) [()] -- fix fullscreen vertex positions now
+    grayscaleShad <- makeShader "texture/grayscale" [vert,frag] [(0,2),(1,2)] TriangleStrip $ const
+        [[[-1, 1],[0,1]]
+        ,[[ 1, 1],[1,1]]
+        ,[[-1,-1],[0,0]]
+        ,[[ 1,-1],[1,0]]
+        ]
+    _ <- F.foldM (pokeShader grayscaleShad) [()] -- fix fullscreen vertex positions now
+
 
 -- background shader
     bgShad <- makeShader "background" [vert,geom,frag] [(0,4),(1,2)] Points pokeBGStrat
@@ -107,6 +115,7 @@ preloadRender = do
         , _backgroundShader         = bgShad
         , _fullscreenShader         = fsShad
         , _boxBlurShader            = boxBlurShad
+        , _grayscaleShader          = grayscaleShad
         , _spareFBO                 = fbo
         , _fboTexture               = fboTO
         , _fboRenderbufferObject    = fboRBO
@@ -161,6 +170,11 @@ setupFramebuffer = do
     generateMipmap' Texture2D
     framebufferTexture2D Framebuffer (ColorAttachment 0) Texture2D fboTO 0
 
+    fboRBO <- genObjectName
+    bindRenderbuffer Renderbuffer $= fboRBO
+    renderbufferStorage Renderbuffer Depth24Stencil8 (RenderbufferSize 600 600)
+    framebufferRenderbuffer Framebuffer DepthStencilAttachment Renderbuffer fboRBO
+
     fboStatus <- framebufferStatus Framebuffer
     print fboStatus