Fixed indexed targets.

Author: svenpanne

Graphics/Rendering/OpenGL/GL/BufferObjects.hs

@@ -361,7 +361,7 @@ mapBufferRange ::
 mapBufferRange t o l b =
    fmap (maybeNullPtr Nothing Just) $ mapBufferRange_ t o l b
 
-flushMappedBufferRange :: BufferTarget -> Offset -> Length -> IO()
+flushMappedBufferRange :: BufferTarget -> Offset -> Length -> IO ()
 flushMappedBufferRange t = glFlushMappedBufferRange (marshalBufferTarget t)
 
 --------------------------------------------------------------------------------
@@ -373,62 +373,71 @@ type RangeSize = GLsizeiptr
 type BufferRange = (BufferObject, RangeStartIndex, RangeSize)
 
 data IndexedBufferTarget =
-     IndexedTransformFeedbackBuffer
---marshaling
+     IndexedAtomicCounterBuffer
+   | IndexedShaderStorageBuffer
+   | IndexedTransformFeedbackBuffer
+   | IndexedUniformBuffer
+   deriving ( Eq, Ord, Show )
+
 marshalIndexedBufferTarget :: IndexedBufferTarget -> IPName1I
 marshalIndexedBufferTarget x = case x of
+   IndexedAtomicCounterBuffer -> GetAtomicCounterBuffer
+   IndexedShaderStorageBuffer -> GetShaderStorageBuffer
    IndexedTransformFeedbackBuffer -> GetTransformFeedbackBuffer
+   IndexedUniformBuffer -> GetUniformBuffer
 
-marshalIndexedBufferStart :: IndexedBufferTarget -> IPName1I
-marshalIndexedBufferStart x = case x of
-   IndexedTransformFeedbackBuffer -> GetTransformFeedbackBufferStart
-
-marshalIndexedBufferSize :: IndexedBufferTarget -> IPName1I
-marshalIndexedBufferSize x = case x of
-   IndexedTransformFeedbackBuffer -> GetTransformFeedbackBufferSize
-
-getIndexed :: Num a => IPName1I -> BufferIndex -> GettableStateVar a
-getIndexed e i = makeGettableStateVar $ getInteger1i fromIntegral e i
-
---buffer
 bindBufferBase :: IndexedBufferTarget -> BufferIndex -> StateVar (Maybe BufferObject)
 bindBufferBase t i = makeStateVar (getIndexedBufferBinding t i) (setIndexedBufferBase t i)
 
-setIndexedBufferBase :: IndexedBufferTarget -> BufferIndex -> Maybe BufferObject -> IO ()
-setIndexedBufferBase t i buf=
-   case marshalGetPName . marshalIndexedBufferTarget $ t of
-      Nothing -> recordInvalidEnum
-      Just t' ->
-         glBindBufferBase t' i . bufferID . fromMaybe noBufferObject $ buf
-
 getIndexedBufferBinding :: IndexedBufferTarget -> BufferIndex -> IO (Maybe BufferObject)
 getIndexedBufferBinding t i = do
    buf <- getInteger1i (BufferObject . fromIntegral) (marshalIndexedBufferTarget t) i
    return $ if buf == noBufferObject then Nothing else Just buf
 
+setIndexedBufferBase :: IndexedBufferTarget -> BufferIndex -> Maybe BufferObject -> IO ()
+setIndexedBufferBase t i buf =
+   case marshalGetPName . marshalIndexedBufferTarget $ t of
+      Nothing -> recordInvalidEnum
+      Just t' -> glBindBufferBase t' i . bufferID . fromMaybe noBufferObject $ buf
+
 bindBufferRange :: IndexedBufferTarget -> BufferIndex -> StateVar (Maybe BufferRange)
 bindBufferRange t i = makeStateVar (getIndexedBufferRange t i) (setIndexedBufferRange t i)
 
+getIndexedBufferRange :: IndexedBufferTarget -> BufferIndex -> IO (Maybe BufferRange)
+getIndexedBufferRange t i = do
+  buf <- getInteger1i (BufferObject . fromIntegral) (marshalIndexedBufferTarget t) i
+  if buf == noBufferObject
+     then return Nothing
+     else do start <- get $ indexedBufferStart t i
+             size <- get $ indexedBufferSize t i
+             return $ Just (buf, start, size)
+
 setIndexedBufferRange :: IndexedBufferTarget -> BufferIndex -> Maybe BufferRange -> IO ()
-setIndexedBufferRange t i (Just (buf, start, range)) =
+setIndexedBufferRange t i br =
    case marshalGetPName . marshalIndexedBufferTarget $ t of
       Nothing -> recordInvalidEnum
       Just t' -> glBindBufferRange t' i (bufferID buf) start range
-setIndexedBufferRange t i Nothing = setIndexedBufferBase t i Nothing
+   where (buf, start, range) = fromMaybe (noBufferObject, 0, 0) br
 
-getIndexedBufferRange :: IndexedBufferTarget -> BufferIndex -> IO(Maybe BufferRange)
-getIndexedBufferRange t i = do
-  buf <- getInteger1i (BufferObject . fromIntegral) (marshalIndexedBufferTarget t) i
-  if buf == noBufferObject
-     then return Nothing
-     else do
-        start <- get $ indexedBufferStart t i
-        size <- get $ indexedBufferSize t i
-        return $ Just (buf, start, size)
+getIndexed :: Num a => IPName1I -> BufferIndex -> GettableStateVar a
+getIndexed e i = makeGettableStateVar $ getInteger641i fromIntegral e i
 
+marshalIndexedBufferStart :: IndexedBufferTarget -> IPName1I
+marshalIndexedBufferStart x = case x of
+   IndexedAtomicCounterBuffer -> GetAtomicCounterBufferStart
+   IndexedShaderStorageBuffer -> GetShaderStorageBufferStart
+   IndexedTransformFeedbackBuffer -> GetTransformFeedbackBufferStart
+   IndexedUniformBuffer -> GetUniformBufferStart
 
 indexedBufferStart :: IndexedBufferTarget -> BufferIndex -> GettableStateVar RangeStartIndex
 indexedBufferStart = getIndexed . marshalIndexedBufferStart
 
+marshalIndexedBufferSize :: IndexedBufferTarget -> IPName1I
+marshalIndexedBufferSize x = case x of
+   IndexedAtomicCounterBuffer -> GetAtomicCounterBufferSize
+   IndexedShaderStorageBuffer -> GetShaderStorageBufferSize
+   IndexedTransformFeedbackBuffer -> GetTransformFeedbackBufferSize
+   IndexedUniformBuffer -> GetUniformBufferSize
+
 indexedBufferSize :: IndexedBufferTarget -> BufferIndex -> GettableStateVar RangeSize
 indexedBufferSize = getIndexed . marshalIndexedBufferSize

Graphics/Rendering/OpenGL/GL/QueryUtils/PName.hs

@@ -69,6 +69,9 @@ getBooleaniv p i = makeGetter (\e -> glGetBooleani_v e i) p
 getIntegeriv :: GetPName p => p -> GLuint -> Ptr GLint -> IO ()
 getIntegeriv p i =  makeGetter (\e -> glGetIntegeri_v e i) p
 
+getInteger64iv :: GetPName p => p -> GLuint -> Ptr GLint64 -> IO ()
+getInteger64iv p i =  makeGetter (\e -> glGetInteger64i_v e i) p
+
 -----------------------------------------------------------------------------
 
 {-# INLINE makeGetter #-}
@@ -128,6 +131,9 @@ class GetPName p => GetIPName1I p where
     getSizei1i :: (GLsizei -> a) -> p -> GLuint -> IO a
     getSizei1i = get1i getIntegeriv
 
+    getInteger641i :: (GLint64 -> a) -> p -> GLuint -> IO a
+    getInteger641i = get1i getInteger64iv
+
 -- Indexed helper
 get1i :: (Storable b, Storable c, GetPName p)
     => (p -> GLuint -> Ptr c -> IO ())
@@ -948,18 +954,36 @@ instance GetPName PName1F where
 
 -----------------------------------------------------------------------------
 
-data IPName1I
-    =  GetTransformFeedbackBuffer
+data IPName1I =
+      GetAtomicCounterBuffer
+    | GetAtomicCounterBufferStart
+    | GetAtomicCounterBufferSize
+    | GetShaderStorageBuffer
+    | GetShaderStorageBufferStart
+    | GetShaderStorageBufferSize
+    | GetTransformFeedbackBuffer
     | GetTransformFeedbackBufferStart
     | GetTransformFeedbackBufferSize
+    | GetUniformBuffer
+    | GetUniformBufferStart
+    | GetUniformBufferSize
 
 instance GetIPName1I IPName1I where
 
 instance GetPName IPName1I where
     marshalGetPName pn = case pn of
+        GetAtomicCounterBuffer -> Just gl_ATOMIC_COUNTER_BUFFER
+        GetAtomicCounterBufferStart -> Just gl_ATOMIC_COUNTER_BUFFER_START
+        GetAtomicCounterBufferSize -> Just gl_ATOMIC_COUNTER_BUFFER_SIZE
+        GetShaderStorageBuffer -> Just gl_SHADER_STORAGE_BUFFER
+        GetShaderStorageBufferStart -> Just gl_SHADER_STORAGE_BUFFER_START
+        GetShaderStorageBufferSize -> Just gl_SHADER_STORAGE_BUFFER_SIZE
         GetTransformFeedbackBuffer -> Just gl_TRANSFORM_FEEDBACK_BUFFER
-        GetTransformFeedbackBufferSize -> Just gl_TRANSFORM_FEEDBACK_BUFFER_SIZE
         GetTransformFeedbackBufferStart -> Just gl_TRANSFORM_FEEDBACK_BUFFER_START
+        GetTransformFeedbackBufferSize -> Just gl_TRANSFORM_FEEDBACK_BUFFER_SIZE
+        GetUniformBuffer -> Just gl_UNIFORM_BUFFER
+        GetUniformBufferStart -> Just gl_UNIFORM_BUFFER_START
+        GetUniformBufferSize -> Just gl_UNIFORM_BUFFER_SIZE
 
 -----------------------------------------------------------------------------
 
@@ -1058,6 +1082,7 @@ data PName4ISemiIndexed
     = GetColorWritemask         -- ^ bool
 
 instance GetPName4I  PName4ISemiIndexed where
+
 instance GetIPName4I PName4ISemiIndexed where
 
 instance GetPName PName4ISemiIndexed where
@@ -1129,6 +1154,7 @@ data PNameNI
     | GetProgramBinaryFormats
 
 instance GetPNameNI PNameNI where
+
 instance GetPName   PNameNI where
    marshalGetPName pn = case pn of
       GetCompressedTextureFormats -> Just gl_COMPRESSED_TEXTURE_FORMATS

OpenGL.cabal

@@ -143,7 +143,7 @@ library
    Graphics.Rendering.OpenGL.GLU.ErrorsInternal
   ghc-options: -Wall -O2
   build-depends:
-   base >= 3 && < 5, bytestring, text, OpenGLRaw >= 1.4.0.0, GLURaw >= 1.3.0.0
+   base >= 3 && < 5, bytestring, text, OpenGLRaw >= 1.4.1.0, GLURaw >= 1.3.0.0
 
 source-repository head
   type:     git