Simpler and more consistent transformFeedbackVaryings API.

Author: svenpanne

Graphics/Rendering/OpenGL/GL/Shaders/Attribs.hs

@@ -53,4 +53,9 @@ bindAttribLocation (Program program) (AttribLocation location) name =
 --------------------------------------------------------------------------------
 
 activeAttribs :: Program -> GettableStateVar [(GLint,VariableType,String)]
-activeAttribs = activeVars activeAttributes activeAttributeMaxLength glGetActiveAttrib
+activeAttribs =
+   activeVars
+      activeAttributes
+      activeAttributeMaxLength
+      glGetActiveAttrib
+      unmarshalVariableType

Graphics/Rendering/OpenGL/GL/Shaders/Uniform.hs

@@ -59,7 +59,12 @@ uniformLocation (Program program) name =
 --------------------------------------------------------------------------------
 
 activeUniforms :: Program -> GettableStateVar [(GLint,VariableType,String)]
-activeUniforms = activeVars numActiveUniforms activeUniformMaxLength glGetActiveUniform
+activeUniforms =
+   activeVars
+      numActiveUniforms
+      activeUniformMaxLength
+      glGetActiveUniform
+      unmarshalVariableType
 
 --------------------------------------------------------------------------------
 

Graphics/Rendering/OpenGL/GL/Shaders/Variables.hs

@@ -15,14 +15,15 @@
 -----------------------------------------------------------------------------
 
 module Graphics.Rendering.OpenGL.GL.Shaders.Variables (
-    VariableType(..), activeVars
+    VariableType(..), unmarshalVariableType, activeVars
 ) where
 
 import Control.Monad
 import Foreign.Marshal.Alloc
 import Foreign.Ptr
 import Foreign.Storable
 import Graphics.Rendering.OpenGL.GL.ByteString
+import Graphics.Rendering.OpenGL.GL.PeekPoke
 import Graphics.Rendering.OpenGL.GL.Shaders.Program
 import Graphics.Rendering.OpenGL.GL.StateVar
 import Graphics.Rendering.OpenGL.Raw
@@ -142,8 +143,10 @@ unmarshalVariableType x
 activeVars :: (Program -> GettableStateVar GLuint)
            -> (Program -> GettableStateVar GLsizei)
            -> (GLuint -> GLuint -> GLsizei -> Ptr GLsizei -> Ptr GLint -> Ptr GLenum -> Ptr GLchar -> IO ())
-           -> Program -> GettableStateVar [(GLint,VariableType,String)]
-activeVars numVars maxLength getter p@(Program program) =
+           -> (GLenum -> a)
+           -> Program
+           -> GettableStateVar [(GLint,a,String)]
+activeVars numVars maxLength getter unmarshalType p@(Program program) =
    makeGettableStateVar $ do
       numActiveVars <- get (numVars p)
       maxLen <- get (maxLength p)
@@ -155,6 +158,6 @@ activeVars numVars maxLength getter p@(Program program) =
                   n <- createAndTrimByteString maxLen $ \nameBuf -> do
                      getter program i maxLen nameLengthBuf sizeBuf typeBuf nameBuf
                      peek nameLengthBuf
-                  s <- peek sizeBuf
-                  t <- peek typeBuf
-                  return (s, unmarshalVariableType t, unpackUtf8 n)
+                  s <- peek1 fromIntegral sizeBuf
+                  t <- peek1 unmarshalType typeBuf
+                  return (s, t, unpackUtf8 n)

Graphics/Rendering/OpenGL/GL/TransformFeedback.hs

@@ -20,24 +20,22 @@ module Graphics.Rendering.OpenGL.GL.TransformFeedback (
 
    -- * Shader related
    transformFeedbackBufferMode,
-   VaryingIndex, MaxLength,
-   getTransformFeedbackVaryings, setTransformFeedbackVaryings,
-   getTransformFeedbackVarying, getTransformFeedbackVaryingMaxLength,
+   transformFeedbackVaryings,
+   setTransformFeedbackVaryings,
 
    -- * limits
    maxTransformFeedbackSeparateAttribs,
    maxTransformFeedbackInterleavedComponents,
    maxTransformFeedbackSeparateComponents
 ) where
 
-import Foreign.Marshal.Alloc
 import Foreign.Marshal.Array
-import Foreign.Storable
 import Graphics.Rendering.OpenGL.GL.ByteString
 import Graphics.Rendering.OpenGL.GL.DataType
 import Graphics.Rendering.OpenGL.GL.PrimitiveMode
 import Graphics.Rendering.OpenGL.GL.QueryUtils
 import Graphics.Rendering.OpenGL.GL.Shaders.Program
+import Graphics.Rendering.OpenGL.GL.Shaders.Variables
 import Graphics.Rendering.OpenGL.GL.StateVar
 import Graphics.Rendering.OpenGL.Raw
 
@@ -49,9 +47,12 @@ beginTransformFeedback = glBeginTransformFeedback . marshalPrimitiveMode
 endTransformFeedback :: IO ()
 endTransformFeedback = glEndTransformFeedback
 
+--------------------------------------------------------------------------------
 
---TranformFeedbackBuffer mode
-data TransformFeedbackBufferMode = InterleavedAttribs | SeperateAttribs
+data TransformFeedbackBufferMode =
+     InterleavedAttribs
+   | SeperateAttribs
+   deriving ( Eq, Ord, Show )
 
 marshalTransformFeedbackBufferMode :: TransformFeedbackBufferMode -> GLenum
 marshalTransformFeedbackBufferMode x = case x of
@@ -83,11 +84,6 @@ maxTransformFeedbackSeparateComponents :: GettableStateVar GLint
 maxTransformFeedbackSeparateComponents = makeGettableStateVar $
    getInteger1 fromIntegral GetMaxTransformFeedbackSeparateComponents
 
------------------------------------------------------------------------------
-
-type VaryingIndex = GLuint
-type MaxLength = GLsizei
-
 --------------------------------------------------------------------------------
 
 -- | Set all the transform feedbacks varyings for this program
@@ -109,30 +105,20 @@ transformFeedbackBufferMode = programVar1
 
 -- | The number of varyings that are currently recorded when in
 -- transform feedback mode
-getTransformFeedbackVaryings :: Program -> GettableStateVar GLuint
-getTransformFeedbackVaryings
-    = programVar1 fromIntegral TransformFeedbackVaryings
+numTransformFeedbackVaryings :: Program -> GettableStateVar GLuint
+numTransformFeedbackVaryings =
+   programVar1 fromIntegral TransformFeedbackVaryings
 
 -- | The maximum length of a varying's name for transform feedback mode
-getTransformFeedbackVaryingMaxLength :: Program -> GettableStateVar GLuint
-getTransformFeedbackVaryingMaxLength
+transformFeedbackVaryingMaxLength :: Program -> GettableStateVar GLsizei
+transformFeedbackVaryingMaxLength
    = programVar1 fromIntegral TransformFeedbackVaryingMaxLength
 
--- | Get the name, datatype and size of a single transform feedback
--- varying.
-getTransformFeedbackVarying :: Program
-   -> VaryingIndex -- ^ the index in a previous array of names of
-                   -- setTransformFeedbackVaryings
-   -> MaxLength -- ^ the maximum length of the returned string
-   -> IO (String, DataType, GLsizei) -- ^ The name of the varying, it's type
-                                     -- and size
-getTransformFeedbackVarying (Program program) vi ml = do
-   alloca $ \nameLengthBuf ->
-      alloca $ \sizeBuf ->
-          alloca $ \typeBuf -> do
-             n <- createAndTrimByteString ml $ \nameBuf -> do
-                glGetTransformFeedbackVarying program vi ml nameLengthBuf sizeBuf typeBuf nameBuf
-                peek nameLengthBuf
-             s <- peek sizeBuf
-             d <- peek typeBuf
-             return (unpackUtf8 n, unmarshalDataType d, s)
+-- | The name, datatype and size of the transform feedback varyings.
+transformFeedbackVaryings :: Program -> GettableStateVar [(GLint, DataType, String)]
+transformFeedbackVaryings =
+   activeVars
+      numTransformFeedbackVaryings
+      transformFeedbackVaryingMaxLength
+      glGetTransformFeedbackVarying
+      unmarshalDataType