From 3e1f789ed52e20f1ddf6e20ed9c7f61cf7aaedbd Mon Sep 17 00:00:00 2001 From: Csaba Hruska Date: Sat, 22 Sep 2018 12:44:47 +0200 Subject: fix stack and compatibility issues --- examples/pickInt.hs | 2 +- src/LambdaCube/GL/Backend.hs | 6 +++--- stack.yaml | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/pickInt.hs b/examples/pickInt.hs index 2703e91..335364a 100644 --- a/examples/pickInt.hs +++ b/examples/pickInt.hs @@ -79,7 +79,7 @@ main = do [LC.GLOutputRenderTexture (fromIntegral -> fbo) _rendTex] -> do rtexPicks <- collectPicks fbo pickPoints printPicks pickPoints rtexPicks - x -> error $ "Unexpected outputs: " <> show x + x -> error $ "Unexpected outputs: " ++ show x -- render to framebuffer & pick LambdaCubeGL.renderFrame pipeDraw diff --git a/src/LambdaCube/GL/Backend.hs b/src/LambdaCube/GL/Backend.hs index 0584a34..1cf3f62 100644 --- a/src/LambdaCube/GL/Backend.hs +++ b/src/LambdaCube/GL/Backend.hs @@ -204,17 +204,17 @@ clearRenderTarget GLRenderTarget{..} values = do VV2F (V2 r g) -> with (V4 r g 0 1) $ glClearBufferfv buf i . castPtr VV3F (V3 r g b) -> with (V4 r g b 1) $ glClearBufferfv buf i . castPtr VV4F (V4 r g b a) -> with (V4 r g b a) $ glClearBufferfv buf i . castPtr - + VInt r -> with (V4 r 0 0 1) $ glClearBufferiv buf i . castPtr VV2I (V2 r g) -> with (V4 r g 0 1) $ glClearBufferiv buf i . castPtr VV3I (V3 r g b) -> with (V4 r g b 1) $ glClearBufferiv buf i . castPtr VV4I (V4 r g b a) -> with (V4 r g b a) $ glClearBufferiv buf i . castPtr - + VWord r -> with (V4 r 0 0 1) $ glClearBufferiv buf i . castPtr VV2U (V2 r g) -> with (V4 r g 0 1) $ glClearBufferiv buf i . castPtr VV3U (V3 r g b) -> with (V4 r g b 1) $ glClearBufferiv buf i . castPtr VV4U (V4 r g b a) -> with (V4 r g b a) $ glClearBufferiv buf i . castPtr - _ -> error $ "internal error: unsupported color attachment format: " <> show c + _ -> error $ "internal error: unsupported color attachment format: " ++ show c _ -> error "internal error (clearRenderTarget)" (mask,_) <- foldM setClearValue (0,0) values diff --git a/stack.yaml b/stack.yaml index 6fc16cc..2a8f9f1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -9,6 +9,7 @@ packages: extra-dep: true extra-deps: - wavefront-0.7.1.1 +- vect-0.4.7 flags: lambdacube-gl: -- cgit v1.2.3