Added traces to GL-wrapper.

1 files changed, 87 insertions, 73 deletions

diff --git a/GL.hs b/GL.hs
index 64b5d0d..722a51f 100644
--- a/GL.hs
+++ b/GL.hs
@@ -48,194 +48,208 @@ module GL
     , module GL
     ) where
 
+import Debug.Trace
 import Control.Monad.IO.Class
 import qualified Graphics.GL.Core33 as C
 import Foreign.Ptr
 
-ind0 :: a -> a
-ind0 = id
-
-ind1 :: (t1 -> t2) -> t1 -> t2
-ind1 f a = f a
-
-ind2 :: (t1 -> t2 -> t3) -> t1 -> t2 -> t3
-ind2 f a b = f a b
-
-ind3 :: (t1 -> t2 -> t3 -> t4) -> t1 -> t2 -> t3 -> t4
-ind3 f a b c = f a b c
-
-ind4 :: (t1 -> t2 -> t3 -> t4 -> t5) -> t1 -> t2 -> t3 -> t4 -> t5
-ind4 f a b c d = f a b c d
-
-ind5 :: (t1 -> t2 -> t3 -> t4 -> t5 -> t6)
+ind0 :: String -> a -> a
+ind0 l = trace l $ id
+
+ind1 :: Show t1 => String -> (t1 -> t2) -> t1 -> t2
+ind1 l f a = trace s $ f a
+ where
+    s = unwords [l,show a]
+
+ind2 :: ( Show t1, Show t2 ) => String -> (t1 -> t2 -> t3) -> t1 -> t2 -> t3
+ind2 l f a b = trace s $ f a b
+ where
+    s = unwords [l,show a,show b]
+
+ind3 :: ( Show t1, Show t2, Show t3
+        ) => String -> (t1 -> t2 -> t3 -> t4) -> t1 -> t2 -> t3 -> t4
+ind3 l f a b c = trace s $ f a b c
+ where
+    s = unwords [l,show a,show b,show c]
+
+ind4 :: ( Show t1, Show t2, Show t3, Show t4 )
+        => String -> (t1 -> t2 -> t3 -> t4 -> t5) -> t1 -> t2 -> t3 -> t4 -> t5
+ind4 l f a b c d = trace s $ f a b c d
+ where
+    s = unwords [l,show a,show b,show c,show d]
+
+ind5 :: ( Show t1, Show t2, Show t3, Show t4, Show t5 )
+        => String -> (t1 -> t2 -> t3 -> t4 -> t5 -> t6)
         -> t1 -> t2 -> t3 -> t4 -> t5 -> t6
-ind5 f a b c d e = f a b c d e
+ind5 l f a b c d e = trace s $ f a b c d e
+ where
+    s = unwords [l,show a,show b,show c,show d,show e]
 
 glCreateProgram :: MonadIO m => m C.GLuint
-glCreateProgram = ind0 C.glCreateProgram
+glCreateProgram = ind0 "glCreateProgram" C.glCreateProgram
 
 glActiveTexture :: MonadIO m =>
                    C.GLenum -> m ()
-glActiveTexture = ind1 C.glActiveTexture
+glActiveTexture = ind1 "glActiveTexture" C.glActiveTexture
 glBindVertexArray :: MonadIO m =>
                      C.GLuint -> m ()
-glBindVertexArray = ind1 C.glBindVertexArray
+glBindVertexArray = ind1 "glBindVertexArray" C.glBindVertexArray
 glClearDepth :: MonadIO m =>
                 C.GLdouble -> m ()
-glClearDepth = ind1 C.glClearDepth
+glClearDepth = ind1 "glClearDepth" C.glClearDepth
 glClear :: MonadIO m => C.GLbitfield -> m ()
-glClear = ind1 C.glClear
+glClear = ind1 "glClear" C.glClear
 glClearStencil :: MonadIO m =>
                   C.GLint -> m ()
-glClearStencil = ind1 C.glClearStencil
+glClearStencil = ind1 "glClearStencil" C.glClearStencil
 glCreateShader :: MonadIO m =>
                   C.GLenum -> m C.GLuint
-glCreateShader = ind1 C.glCreateShader
+glCreateShader = ind1 "glCreateShader" C.glCreateShader
 glCullFace :: MonadIO m => C.GLenum -> m ()
-glCullFace = ind1 C.glCullFace
+glCullFace = ind1 "glCullFace" C.glCullFace
 glDeleteProgram :: MonadIO m =>
                    C.GLuint -> m ()
-glDeleteProgram = ind1 C.glDeleteProgram
+glDeleteProgram = ind1 "glDeleteProgram" C.glDeleteProgram
 glDeleteShader :: MonadIO m =>
                   C.GLuint -> m ()
-glDeleteShader = ind1 C.glDeleteShader
+glDeleteShader = ind1 "glDeleteShader" C.glDeleteShader
 glDepthFunc :: MonadIO m => C.GLenum -> m ()
-glDepthFunc = ind1 C.glDepthFunc
+glDepthFunc = ind1 "glDepthFunc" C.glDepthFunc
 glDepthMask :: MonadIO m =>
                C.GLboolean -> m ()
-glDepthMask = ind1 C.glDepthMask
+glDepthMask = ind1 "glDepthMask" C.glDepthMask
 glDisable :: MonadIO m => C.GLenum -> m ()
-glDisable = ind1 C.glDisable
+glDisable = ind1 "glDisable" C.glDisable
 glEnable :: MonadIO m => C.GLenum -> m ()
-glEnable = ind1 C.glEnable
+glEnable = ind1 "glEnable" C.glEnable
 glEnableVertexAttribArray :: MonadIO m =>
                              C.GLuint -> m ()
-glEnableVertexAttribArray = ind1 C.glEnableVertexAttribArray
+glEnableVertexAttribArray = ind1 "glEnableVertexAttribArray" C.glEnableVertexAttribArray
 glFrontFace :: MonadIO m => C.GLenum -> m ()
-glFrontFace = ind1 C.glFrontFace
+glFrontFace = ind1 "glFrontFace" C.glFrontFace
 glLineWidth :: MonadIO m =>
                C.GLfloat -> m ()
-glLineWidth = ind1 C.glLineWidth
+glLineWidth = ind1 "glLineWidth" C.glLineWidth
 glLinkProgram :: MonadIO m =>
                  C.GLuint -> m ()
-glLinkProgram = ind1 C.glLinkProgram
+glLinkProgram = ind1 "glLinkProgram" C.glLinkProgram
 glLogicOp :: MonadIO m => C.GLenum -> m ()
-glLogicOp = ind1 C.glLogicOp
+glLogicOp = ind1 "glLogicOp" C.glLogicOp
 glPointSize :: MonadIO m =>
                C.GLfloat -> m ()
-glPointSize = ind1 C.glPointSize
+glPointSize = ind1 "glPointSize" C.glPointSize
 glProvokingVertex :: MonadIO m =>
                      C.GLenum -> m ()
-glProvokingVertex = ind1 C.glProvokingVertex
+glProvokingVertex = ind1 "glProvokingVertex" C.glProvokingVertex
 glUseProgram :: MonadIO m =>
                 C.GLuint -> m ()
-glUseProgram = ind1 C.glUseProgram
+glUseProgram = ind1 "glUseProgram" C.glUseProgram
 
 glAttachShader :: MonadIO m =>
                   C.GLuint -> C.GLuint -> m ()
-glAttachShader = ind2 C.glAttachShader
+glAttachShader = ind2 "glAttachShader" C.glAttachShader
 glBindBuffer :: MonadIO m =>
                 C.GLenum -> C.GLuint -> m ()
-glBindBuffer = ind2 C.glBindBuffer
+glBindBuffer = ind2 "glBindBuffer" C.glBindBuffer
 glBindSampler :: MonadIO m =>
                  C.GLuint -> C.GLuint -> m ()
-glBindSampler = ind2 C.glBindSampler
+glBindSampler = ind2 "glBindSampler" C.glBindSampler
 glBindTexture :: MonadIO m =>
                  C.GLenum -> C.GLuint -> m ()
-glBindTexture = ind2 C.glBindTexture
+glBindTexture = ind2 "glBindTexture" C.glBindTexture
 glPolygonMode :: MonadIO m =>
                  C.GLenum -> C.GLenum -> m ()
-glPolygonMode = ind2 C.glPolygonMode
+glPolygonMode = ind2 "glPolygonMode" C.glPolygonMode
 
 
 
 glDisableVertexAttribArray :: MonadIO m => C.GLuint -> m ()
-glDisableVertexAttribArray = ind1 C.glDisableVertexAttribArray
+glDisableVertexAttribArray = ind1 "glDisableVertexAttribArray" C.glDisableVertexAttribArray
 
 glBindFramebuffer :: MonadIO m => C.GLenum -> C.GLuint -> m ()
-glBindFramebuffer = ind2 C.glBindFramebuffer
+glBindFramebuffer = ind2 "glBindFramebuffer" C.glBindFramebuffer
 glBlendEquationSeparate :: MonadIO m =>
                            C.GLenum -> C.GLenum -> m ()
-glBlendEquationSeparate = ind2 C.glBlendEquationSeparate
+glBlendEquationSeparate = ind2 "glBlendEquationSeparate" C.glBlendEquationSeparate
 glDeleteFramebuffers :: MonadIO m =>
                         C.GLsizei -> Ptr C.GLuint -> m ()
-glDeleteFramebuffers = ind2 C.glDeleteFramebuffers
+glDeleteFramebuffers = ind2 "glDeleteFramebuffers" C.glDeleteFramebuffers
 glDeleteSamplers :: MonadIO m =>
                     C.GLsizei -> Ptr C.GLuint -> m ()
-glDeleteSamplers = ind2 C.glDeleteSamplers
+glDeleteSamplers = ind2 "glDeleteSamplers" C.glDeleteSamplers
 glDeleteTextures :: MonadIO m =>
                     C.GLsizei -> Ptr C.GLuint -> m ()
-glDeleteTextures = ind2 C.glDeleteTextures
+glDeleteTextures = ind2 "glDeleteTextures" C.glDeleteTextures
 glDeleteVertexArrays :: MonadIO m =>
                         C.GLsizei -> Ptr C.GLuint -> m ()
-glDeleteVertexArrays = ind2 C.glDeleteVertexArrays
+glDeleteVertexArrays = ind2 "glDeleteVertexArrays" C.glDeleteVertexArrays
 glDrawBuffers :: MonadIO m =>
                  C.GLsizei -> Ptr C.GLenum -> m ()
-glDrawBuffers = ind2 C.glDrawBuffers
+glDrawBuffers = ind2 "glDrawBuffers" C.glDrawBuffers
 glGenFramebuffers :: MonadIO m =>
                      C.GLsizei -> Ptr C.GLuint -> m ()
-glGenFramebuffers = ind2 C.glGenFramebuffers
+glGenFramebuffers = ind2 "glGenFramebuffers" C.glGenFramebuffers
 glGenVertexArrays :: MonadIO m =>
                      C.GLsizei -> Ptr C.GLuint -> m ()
-glGenVertexArrays = ind2 C.glGenVertexArrays
+glGenVertexArrays = ind2 "glGenVertexArrays" C.glGenVertexArrays
 glPointParameterf :: MonadIO m => C.GLenum -> C.GLfloat -> m ()
-glPointParameterf = ind2 C.glPointParameterf
+glPointParameterf = ind2 "glPointParameterf" C.glPointParameterf
 glPolygonOffset :: MonadIO m => C.GLfloat -> C.GLfloat -> m ()
-glPolygonOffset = ind2 C.glPolygonOffset
+glPolygonOffset = ind2 "glPolygonOffset" C.glPolygonOffset
 glUniform1i :: MonadIO m => C.GLint -> C.GLint -> m ()
-glUniform1i = ind2 C.glUniform1i
+glUniform1i = ind2 "glUniform1i" C.glUniform1i
 
 glBindFragDataLocation :: MonadIO m =>
                           C.GLuint -> C.GLuint -> Ptr C.GLchar -> m ()
-glBindFragDataLocation = ind3 C.glBindFragDataLocation
+glBindFragDataLocation = ind3 "glBindFragDataLocation" C.glBindFragDataLocation
 glClearBufferfv :: MonadIO m =>
                    C.GLenum -> C.GLint -> Ptr C.GLfloat -> m ()
-glClearBufferfv = ind3 C.glClearBufferfv
+glClearBufferfv = ind3 "glClearBufferfv" C.glClearBufferfv
 glClearBufferiv :: MonadIO m =>
                    C.GLenum -> C.GLint -> Ptr C.GLint -> m ()
-glClearBufferiv = ind3 C.glClearBufferiv
+glClearBufferiv = ind3 "glClearBufferiv" C.glClearBufferiv
 
 glClearColor :: MonadIO m =>
                 C.GLfloat -> C.GLfloat -> C.GLfloat -> C.GLfloat -> m ()
-glClearColor = ind4 C.glClearColor
+glClearColor = ind4 "glClearColor" C.glClearColor
 glColorMask :: MonadIO m =>
                C.GLboolean -> C.GLboolean -> C.GLboolean -> C.GLboolean -> m ()
-glColorMask = ind4 C.glColorMask
+glColorMask = ind4 "glColorMask" C.glColorMask
 glFramebufferTexture :: MonadIO m =>
                         C.GLenum -> C.GLenum -> C.GLuint -> C.GLint -> m ()
-glFramebufferTexture = ind4 C.glFramebufferTexture
+glFramebufferTexture = ind4 "glFramebufferTexture" C.glFramebufferTexture
 glViewport :: MonadIO m =>
               C.GLint -> C.GLint -> C.GLsizei -> C.GLsizei -> m ()
-glViewport = ind4 C.glViewport
+glViewport = ind4 "glViewport" C.glViewport
 glBlendColor :: MonadIO m =>
                 C.GLfloat -> C.GLfloat -> C.GLfloat -> C.GLfloat -> m ()
-glBlendColor = ind4 C.glBlendColor
+glBlendColor = ind4 "glBlendColor" C.glBlendColor
 
 glVertexAttribPointer :: MonadIO m =>
                          C.GLuint
                          -> C.GLint -> C.GLenum -> C.GLboolean -> C.GLsizei -> Ptr a -> m ()
-glVertexAttribPointer = ind0 C.glVertexAttribPointer
+glVertexAttribPointer = ind0 "glVertexAttribPointer" C.glVertexAttribPointer
 
 glDrawArrays :: MonadIO m =>
                 C.GLenum -> C.GLint -> C.GLsizei -> m ()
-glDrawArrays = ind3 C.glDrawArrays
+glDrawArrays = ind3 "glDrawArrays" C.glDrawArrays
 
 glBlendFuncSeparate :: MonadIO m =>
                        C.GLenum -> C.GLenum -> C.GLenum -> C.GLenum -> m ()
-glBlendFuncSeparate = ind4 C.glBlendFuncSeparate
+glBlendFuncSeparate = ind4 "glBlendFuncSeparate" C.glBlendFuncSeparate
 glDrawElements :: MonadIO m =>
                   C.GLenum -> C.GLsizei -> C.GLenum -> Ptr a -> m ()
-glDrawElements = ind4 C.glDrawElements
+glDrawElements = ind4 "glDrawElements" C.glDrawElements
 
 glVertexAttribIPointer :: MonadIO m =>
                           C.GLuint -> C.GLint -> C.GLenum -> C.GLsizei -> Ptr a -> m ()
-glVertexAttribIPointer = ind5 C.glVertexAttribIPointer
+glVertexAttribIPointer = ind5 "glVertexAttribIPointer" C.glVertexAttribIPointer
 glFramebufferTexture1D :: MonadIO m =>
                           C.GLenum -> C.GLenum -> C.GLenum -> C.GLuint -> C.GLint -> m ()
-glFramebufferTexture1D = ind5 C.glFramebufferTexture1D
+glFramebufferTexture1D = ind5 "glFramebufferTexture1D" C.glFramebufferTexture1D
 glFramebufferTexture2D :: MonadIO m =>
                           C.GLenum -> C.GLenum -> C.GLenum -> C.GLuint -> C.GLint -> m ()
-glFramebufferTexture2D = ind5 C.glFramebufferTexture2D
+glFramebufferTexture2D = ind5 "glFramebufferTexture2D" C.glFramebufferTexture2D
 glFramebufferTextureLayer :: MonadIO m =>
                              C.GLenum -> C.GLenum -> C.GLuint -> C.GLint -> C.GLint -> m ()
-glFramebufferTextureLayer = ind5 C.glFramebufferTextureLayer
+glFramebufferTextureLayer = ind5 "glFramebufferTextureLayer" C.glFramebufferTextureLayer