Updated OpenGL registry to accf5ad3c. Bumped version to 3.3.1.0.

CHANGELOG.md

@@ -1,6 +1,10 @@
+3.3.1.0
+-------
+* Updated OpenGL registry to accf5ad3c.
+
 3.3.0.2
 -------
-* Updated OpenGL registry tob7aee529f.
+* Updated OpenGL registry to b7aee529f.
 * Relaxed version bound of `containers` package.
 
 3.3.0.1

OpenGLRaw.cabal

@@ -1,5 +1,5 @@
 name: OpenGLRaw
-version: 3.3.0.2
+version: 3.3.1.0
 synopsis: A raw binding for the OpenGL graphics system
 description:
   OpenGLRaw is a raw Haskell binding for the OpenGL 4.6 graphics system and
@@ -77,6 +77,7 @@ library
     Graphics.GL.AMD.DebugOutput
     Graphics.GL.AMD.DepthClampSeparate
     Graphics.GL.AMD.DrawBuffersBlend
+    Graphics.GL.AMD.FramebufferMultisampleAdvanced
     Graphics.GL.AMD.FramebufferSamplePositions
     Graphics.GL.AMD.GPUShaderHalfFloat
     Graphics.GL.AMD.GPUShaderInt64

src/Graphics/GL/AMD.hs

@@ -17,6 +17,7 @@ module Graphics.GL.AMD (
   module Graphics.GL.AMD.DebugOutput,
   module Graphics.GL.AMD.DepthClampSeparate,
   module Graphics.GL.AMD.DrawBuffersBlend,
+  module Graphics.GL.AMD.FramebufferMultisampleAdvanced,
   module Graphics.GL.AMD.FramebufferSamplePositions,
   module Graphics.GL.AMD.GPUShaderHalfFloat,
   module Graphics.GL.AMD.GPUShaderInt64,
@@ -39,6 +40,7 @@ import Graphics.GL.AMD.BlendMinmaxFactor
 import Graphics.GL.AMD.DebugOutput
 import Graphics.GL.AMD.DepthClampSeparate
 import Graphics.GL.AMD.DrawBuffersBlend
+import Graphics.GL.AMD.FramebufferMultisampleAdvanced
 import Graphics.GL.AMD.FramebufferSamplePositions
 import Graphics.GL.AMD.GPUShaderHalfFloat
 import Graphics.GL.AMD.GPUShaderInt64

src/Graphics/GL/Core30.hs

@@ -431,6 +431,7 @@ module Graphics.GL.Core30 (
   pattern GL_HINT_BIT,
   pattern GL_INCR,
   pattern GL_INCR_WRAP,
+  pattern GL_INDEX,
   pattern GL_INDEX_ARRAY,
   pattern GL_INDEX_ARRAY_BUFFER_BINDING,
   pattern GL_INDEX_ARRAY_POINTER,
@@ -1034,9 +1035,11 @@ module Graphics.GL.Core30 (
   pattern GL_TEXTURE_GREEN_TYPE,
   pattern GL_TEXTURE_HEIGHT,
   pattern GL_TEXTURE_INTENSITY_SIZE,
+  pattern GL_TEXTURE_INTENSITY_TYPE,
   pattern GL_TEXTURE_INTERNAL_FORMAT,
   pattern GL_TEXTURE_LOD_BIAS,
   pattern GL_TEXTURE_LUMINANCE_SIZE,
+  pattern GL_TEXTURE_LUMINANCE_TYPE,
   pattern GL_TEXTURE_MAG_FILTER,
   pattern GL_TEXTURE_MATRIX,
   pattern GL_TEXTURE_MAX_LEVEL,

src/Graphics/GL/Core31.hs

@@ -435,6 +435,7 @@ module Graphics.GL.Core31 (
   pattern GL_HINT_BIT,
   pattern GL_INCR,
   pattern GL_INCR_WRAP,
+  pattern GL_INDEX,
   pattern GL_INDEX_ARRAY,
   pattern GL_INDEX_ARRAY_BUFFER_BINDING,
   pattern GL_INDEX_ARRAY_POINTER,
@@ -1071,9 +1072,11 @@ module Graphics.GL.Core31 (
   pattern GL_TEXTURE_GREEN_TYPE,
   pattern GL_TEXTURE_HEIGHT,
   pattern GL_TEXTURE_INTENSITY_SIZE,
+  pattern GL_TEXTURE_INTENSITY_TYPE,
   pattern GL_TEXTURE_INTERNAL_FORMAT,
   pattern GL_TEXTURE_LOD_BIAS,
   pattern GL_TEXTURE_LUMINANCE_SIZE,
+  pattern GL_TEXTURE_LUMINANCE_TYPE,
   pattern GL_TEXTURE_MAG_FILTER,
   pattern GL_TEXTURE_MATRIX,
   pattern GL_TEXTURE_MAX_LEVEL,

src/Graphics/GL/ExtensionPredicates.hs

@@ -96,6 +96,17 @@ gl_AMD_draw_buffers_blend :: Bool
 gl_AMD_draw_buffers_blend = member "GL_AMD_draw_buffers_blend" extensions
 {-# NOINLINE gl_AMD_draw_buffers_blend #-}
 
+-- | Is the <https://www.opengl.org/registry/specs/AMD/framebuffer_multisample_advanced.txt AMD_framebuffer_multisample_advanced> extension supported?
+glGetAMDFramebufferMultisampleAdvanced :: MonadIO m => m Bool
+glGetAMDFramebufferMultisampleAdvanced = getExtensions >>= (return . member "GL_AMD_framebuffer_multisample_advanced")
+
+-- | Is the <https://www.opengl.org/registry/specs/AMD/framebuffer_multisample_advanced.txt AMD_framebuffer_multisample_advanced> extension supported?
+-- Note that in the presence of multiple contexts with different capabilities,
+-- this might be wrong. Use 'glGetAMDFramebufferMultisampleAdvanced' in those cases instead.
+gl_AMD_framebuffer_multisample_advanced :: Bool
+gl_AMD_framebuffer_multisample_advanced = member "GL_AMD_framebuffer_multisample_advanced" extensions
+{-# NOINLINE gl_AMD_framebuffer_multisample_advanced #-}
+
 -- | Is the <https://www.opengl.org/registry/specs/AMD/framebuffer_sample_positions.txt AMD_framebuffer_sample_positions> extension supported?
 glGetAMDFramebufferSamplePositions :: MonadIO m => m Bool
 glGetAMDFramebufferSamplePositions = getExtensions >>= (return . member "GL_AMD_framebuffer_sample_positions")

src/Graphics/GL/Functions/F18.hs

@@ -110,11 +110,11 @@ module Graphics.GL.Functions.F18 (
   glNamedRenderbufferStorage,
   glNamedRenderbufferStorageEXT,
   glNamedRenderbufferStorageMultisample,
+  glNamedRenderbufferStorageMultisampleAdvancedAMD,
   glNamedRenderbufferStorageMultisampleCoverageEXT,
   glNamedRenderbufferStorageMultisampleEXT,
   glNamedStringARB,
-  glNewList,
-  glNewObjectBufferATI
+  glNewList
 ) where
 
 import Control.Monad.IO.Class ( MonadIO(..) )
@@ -1641,6 +1641,23 @@ glNamedRenderbufferStorageMultisample v1 v2 v3 v4 v5 = liftIO $ dyn617 ptr_glNam
 ptr_glNamedRenderbufferStorageMultisample :: FunPtr (GLuint -> GLsizei -> GLenum -> GLsizei -> GLsizei -> IO ())
 ptr_glNamedRenderbufferStorageMultisample = unsafePerformIO $ getCommand "glNamedRenderbufferStorageMultisample"
 
+-- glNamedRenderbufferStorageMultisampleAdvancedAMD ----------------------------
+
+glNamedRenderbufferStorageMultisampleAdvancedAMD
+  :: MonadIO m
+  => GLuint -- ^ @renderbuffer@ of type @Renderbuffer@.
+  -> GLsizei -- ^ @samples@.
+  -> GLsizei -- ^ @storageSamples@.
+  -> GLenum -- ^ @internalformat@ of type [InternalFormat](Graphics-GL-Groups.html#InternalFormat).
+  -> GLsizei -- ^ @width@.
+  -> GLsizei -- ^ @height@.
+  -> m ()
+glNamedRenderbufferStorageMultisampleAdvancedAMD v1 v2 v3 v4 v5 v6 = liftIO $ dyn618 ptr_glNamedRenderbufferStorageMultisampleAdvancedAMD v1 v2 v3 v4 v5 v6
+
+{-# NOINLINE ptr_glNamedRenderbufferStorageMultisampleAdvancedAMD #-}
+ptr_glNamedRenderbufferStorageMultisampleAdvancedAMD :: FunPtr (GLuint -> GLsizei -> GLsizei -> GLenum -> GLsizei -> GLsizei -> IO ())
+ptr_glNamedRenderbufferStorageMultisampleAdvancedAMD = unsafePerformIO $ getCommand "glNamedRenderbufferStorageMultisampleAdvancedAMD"
+
 -- glNamedRenderbufferStorageMultisampleCoverageEXT ----------------------------
 
 glNamedRenderbufferStorageMultisampleCoverageEXT
@@ -1704,17 +1721,3 @@ glNewList v1 v2 = liftIO $ dyn16 ptr_glNewList v1 v2
 ptr_glNewList :: FunPtr (GLuint -> GLenum -> IO ())
 ptr_glNewList = unsafePerformIO $ getCommand "glNewList"
 
--- glNewObjectBufferATI --------------------------------------------------------
-
-glNewObjectBufferATI
-  :: MonadIO m
-  => GLsizei -- ^ @size@.
-  -> Ptr a -- ^ @pointer@ pointing to @size@ elements of type @a@.
-  -> GLenum -- ^ @usage@ of type @ArrayObjectUsageATI@.
-  -> m GLuint
-glNewObjectBufferATI v1 v2 v3 = liftIO $ dyn620 ptr_glNewObjectBufferATI v1 v2 v3
-
-{-# NOINLINE ptr_glNewObjectBufferATI #-}
-ptr_glNewObjectBufferATI :: FunPtr (GLsizei -> Ptr a -> GLenum -> IO GLuint)
-ptr_glNewObjectBufferATI = unsafePerformIO $ getCommand "glNewObjectBufferATI"
-

src/Graphics/GL/Functions/F19.hs

@@ -15,6 +15,7 @@
 --------------------------------------------------------------------------------
 
 module Graphics.GL.Functions.F19 (
+  glNewObjectBufferATI,
   glNormal3b,
   glNormal3bv,
   glNormal3d,
@@ -113,8 +114,7 @@ module Graphics.GL.Functions.F19 (
   glPixelTransformParameteriEXT,
   glPixelTransformParameterivEXT,
   glPixelZoom,
-  glPixelZoomxOES,
-  glPointAlongPathNV
+  glPixelZoomxOES
 ) where
 
 import Control.Monad.IO.Class ( MonadIO(..) )
@@ -123,6 +123,20 @@ import Graphics.GL.Foreign
 import Graphics.GL.Types
 import System.IO.Unsafe ( unsafePerformIO )
 
+-- glNewObjectBufferATI --------------------------------------------------------
+
+glNewObjectBufferATI
+  :: MonadIO m
+  => GLsizei -- ^ @size@.
+  -> Ptr a -- ^ @pointer@ pointing to @size@ elements of type @a@.
+  -> GLenum -- ^ @usage@ of type @ArrayObjectUsageATI@.
+  -> m GLuint
+glNewObjectBufferATI v1 v2 v3 = liftIO $ dyn620 ptr_glNewObjectBufferATI v1 v2 v3
+
+{-# NOINLINE ptr_glNewObjectBufferATI #-}
+ptr_glNewObjectBufferATI :: FunPtr (GLsizei -> Ptr a -> GLenum -> IO GLuint)
+ptr_glNewObjectBufferATI = unsafePerformIO $ getCommand "glNewObjectBufferATI"
+
 -- glNormal3b ------------------------------------------------------------------
 
 -- | Manual page for <https://www.opengl.org/sdk/docs/man2/xhtml/glNormal.xml OpenGL 2.x>. The vector equivalent of this command is 'glNormal3bv'.
@@ -1550,22 +1564,3 @@ glPixelZoomxOES v1 v2 = liftIO $ dyn228 ptr_glPixelZoomxOES v1 v2
 ptr_glPixelZoomxOES :: FunPtr (GLfixed -> GLfixed -> IO ())
 ptr_glPixelZoomxOES = unsafePerformIO $ getCommand "glPixelZoomxOES"
 
--- glPointAlongPathNV ----------------------------------------------------------
-
-glPointAlongPathNV
-  :: MonadIO m
-  => GLuint -- ^ @path@ of type @Path@.
-  -> GLsizei -- ^ @startSegment@.
-  -> GLsizei -- ^ @numSegments@.
-  -> GLfloat -- ^ @distance@.
-  -> Ptr GLfloat -- ^ @x@ pointing to @1@ element of type @GLfloat@.
-  -> Ptr GLfloat -- ^ @y@ pointing to @1@ element of type @GLfloat@.
-  -> Ptr GLfloat -- ^ @tangentX@ pointing to @1@ element of type @GLfloat@.
-  -> Ptr GLfloat -- ^ @tangentY@ pointing to @1@ element of type @GLfloat@.
-  -> m GLboolean -- ^ of type [Boolean](Graphics-GL-Groups.html#Boolean).
-glPointAlongPathNV v1 v2 v3 v4 v5 v6 v7 v8 = liftIO $ dyn636 ptr_glPointAlongPathNV v1 v2 v3 v4 v5 v6 v7 v8
-
-{-# NOINLINE ptr_glPointAlongPathNV #-}
-ptr_glPointAlongPathNV :: FunPtr (GLuint -> GLsizei -> GLsizei -> GLfloat -> Ptr GLfloat -> Ptr GLfloat -> Ptr GLfloat -> Ptr GLfloat -> IO GLboolean)
-ptr_glPointAlongPathNV = unsafePerformIO $ getCommand "glPointAlongPathNV"
-

src/Graphics/GL/Functions/F20.hs

@@ -15,6 +15,7 @@
 --------------------------------------------------------------------------------
 
 module Graphics.GL.Functions.F20 (
+  glPointAlongPathNV,
   glPointParameterf,
   glPointParameterfARB,
   glPointParameterfEXT,
@@ -113,8 +114,7 @@ module Graphics.GL.Functions.F20 (
   glProgramUniform1dv,
   glProgramUniform1dvEXT,
   glProgramUniform1f,
-  glProgramUniform1fEXT,
-  glProgramUniform1fv
+  glProgramUniform1fEXT
 ) where
 
 import Control.Monad.IO.Class ( MonadIO(..) )
@@ -123,6 +123,25 @@ import Graphics.GL.Foreign
 import Graphics.GL.Types
 import System.IO.Unsafe ( unsafePerformIO )
 
+-- glPointAlongPathNV ----------------------------------------------------------
+
+glPointAlongPathNV
+  :: MonadIO m
+  => GLuint -- ^ @path@ of type @Path@.
+  -> GLsizei -- ^ @startSegment@.
+  -> GLsizei -- ^ @numSegments@.
+  -> GLfloat -- ^ @distance@.
+  -> Ptr GLfloat -- ^ @x@ pointing to @1@ element of type @GLfloat@.
+  -> Ptr GLfloat -- ^ @y@ pointing to @1@ element of type @GLfloat@.
+  -> Ptr GLfloat -- ^ @tangentX@ pointing to @1@ element of type @GLfloat@.
+  -> Ptr GLfloat -- ^ @tangentY@ pointing to @1@ element of type @GLfloat@.
+  -> m GLboolean -- ^ of type [Boolean](Graphics-GL-Groups.html#Boolean).
+glPointAlongPathNV v1 v2 v3 v4 v5 v6 v7 v8 = liftIO $ dyn636 ptr_glPointAlongPathNV v1 v2 v3 v4 v5 v6 v7 v8
+
+{-# NOINLINE ptr_glPointAlongPathNV #-}
+ptr_glPointAlongPathNV :: FunPtr (GLuint -> GLsizei -> GLsizei -> GLfloat -> Ptr GLfloat -> Ptr GLfloat -> Ptr GLfloat -> Ptr GLfloat -> IO GLboolean)
+ptr_glPointAlongPathNV = unsafePerformIO $ getCommand "glPointAlongPathNV"
+
 -- glPointParameterf -----------------------------------------------------------
 
 -- | Manual pages for <https://www.opengl.org/sdk/docs/man2/xhtml/glPointParameter.xml OpenGL 2.x> or <https://www.opengl.org/sdk/docs/man3/xhtml/glPointParameter.xml OpenGL 3.x> or <https://www.opengl.org/sdk/docs/man4/html/glPointParameter.xhtml OpenGL 4.x>.
@@ -1595,19 +1614,3 @@ glProgramUniform1fEXT v1 v2 v3 = liftIO $ dyn659 ptr_glProgramUniform1fEXT v1 v2
 ptr_glProgramUniform1fEXT :: FunPtr (GLuint -> GLint -> GLfloat -> IO ())
 ptr_glProgramUniform1fEXT = unsafePerformIO $ getCommand "glProgramUniform1fEXT"
 
--- glProgramUniform1fv ---------------------------------------------------------
-
--- | Manual page for <https://www.opengl.org/sdk/docs/man4/html/glProgramUniform.xhtml OpenGL 4.x>.
-glProgramUniform1fv
-  :: MonadIO m
-  => GLuint -- ^ @program@.
-  -> GLint -- ^ @location@.
-  -> GLsizei -- ^ @count@.
-  -> Ptr GLfloat -- ^ @value@ pointing to @count@ elements of type @GLfloat@.
-  -> m ()
-glProgramUniform1fv v1 v2 v3 v4 = liftIO $ dyn472 ptr_glProgramUniform1fv v1 v2 v3 v4
-
-{-# NOINLINE ptr_glProgramUniform1fv #-}
-ptr_glProgramUniform1fv :: FunPtr (GLuint -> GLint -> GLsizei -> Ptr GLfloat -> IO ())
-ptr_glProgramUniform1fv = unsafePerformIO $ getCommand "glProgramUniform1fv"
-

src/Graphics/GL/Functions/F21.hs

@@ -15,6 +15,7 @@
 --------------------------------------------------------------------------------
 
 module Graphics.GL.Functions.F21 (
+  glProgramUniform1fv,
   glProgramUniform1fvEXT,
   glProgramUniform1i,
   glProgramUniform1i64ARB,
@@ -113,8 +114,7 @@ module Graphics.GL.Functions.F21 (
   glProgramUniformMatrix2dv,
   glProgramUniformMatrix2dvEXT,
   glProgramUniformMatrix2fv,
-  glProgramUniformMatrix2fvEXT,
-  glProgramUniformMatrix2x3dv
+  glProgramUniformMatrix2fvEXT
 ) where
 
 import Control.Monad.IO.Class ( MonadIO(..) )
@@ -123,6 +123,22 @@ import Graphics.GL.Foreign
 import Graphics.GL.Types
 import System.IO.Unsafe ( unsafePerformIO )
 
+-- glProgramUniform1fv ---------------------------------------------------------
+
+-- | Manual page for <https://www.opengl.org/sdk/docs/man4/html/glProgramUniform.xhtml OpenGL 4.x>.
+glProgramUniform1fv
+  :: MonadIO m
+  => GLuint -- ^ @program@.
+  -> GLint -- ^ @location@.
+  -> GLsizei -- ^ @count@.
+  -> Ptr GLfloat -- ^ @value@ pointing to @count@ elements of type @GLfloat@.
+  -> m ()
+glProgramUniform1fv v1 v2 v3 v4 = liftIO $ dyn472 ptr_glProgramUniform1fv v1 v2 v3 v4
+
+{-# NOINLINE ptr_glProgramUniform1fv #-}
+ptr_glProgramUniform1fv :: FunPtr (GLuint -> GLint -> GLsizei -> Ptr GLfloat -> IO ())
+ptr_glProgramUniform1fv = unsafePerformIO $ getCommand "glProgramUniform1fv"
+
 -- glProgramUniform1fvEXT ------------------------------------------------------
 
 -- | This command is an alias for 'glProgramUniform1fv'.
@@ -1686,19 +1702,3 @@ glProgramUniformMatrix2fvEXT v1 v2 v3 v4 v5 = liftIO $ dyn693 ptr_glProgramUnifo
 ptr_glProgramUniformMatrix2fvEXT :: FunPtr (GLuint -> GLint -> GLsizei -> GLboolean -> Ptr GLfloat -> IO ())
 ptr_glProgramUniformMatrix2fvEXT = unsafePerformIO $ getCommand "glProgramUniformMatrix2fvEXT"
 
--- glProgramUniformMatrix2x3dv -------------------------------------------------
-
-glProgramUniformMatrix2x3dv
-  :: MonadIO m
-  => GLuint -- ^ @program@.
-  -> GLint -- ^ @location@.
-  -> GLsizei -- ^ @count@.
-  -> GLboolean -- ^ @transpose@ of type [Boolean](Graphics-GL-Groups.html#Boolean).
-  -> Ptr GLdouble -- ^ @value@ pointing to @count*6@ elements of type @GLdouble@.
-  -> m ()
-glProgramUniformMatrix2x3dv v1 v2 v3 v4 v5 = liftIO $ dyn692 ptr_glProgramUniformMatrix2x3dv v1 v2 v3 v4 v5
-
-{-# NOINLINE ptr_glProgramUniformMatrix2x3dv #-}
-ptr_glProgramUniformMatrix2x3dv :: FunPtr (GLuint -> GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
-ptr_glProgramUniformMatrix2x3dv = unsafePerformIO $ getCommand "glProgramUniformMatrix2x3dv"
-