Skip to content

Commit d773a33

Browse files
svenpannesvenpanne
committed
Updated OpenGL registry to accf5ad3c. Bumped version to 3.3.1.0.
1 parent 217d125 commit d773a33

24 files changed

+477
-403
lines changed

‎CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
3.3.1.0
2+
-------
3+
* Updated OpenGL registry to accf5ad3c.
4+
15
3.3.0.2
26
-------
3-
* Updated OpenGL registry tob7aee529f.
7+
* Updated OpenGL registry to b7aee529f.
48
* Relaxed version bound of `containers` package.
59

610
3.3.0.1

‎OpenGLRaw.cabal

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: OpenGLRaw
2-
version: 3.3.0.2
2+
version: 3.3.1.0
33
synopsis: A raw binding for the OpenGL graphics system
44
description:
55
OpenGLRaw is a raw Haskell binding for the OpenGL 4.6 graphics system and
@@ -77,6 +77,7 @@ library
7777
Graphics.GL.AMD.DebugOutput
7878
Graphics.GL.AMD.DepthClampSeparate
7979
Graphics.GL.AMD.DrawBuffersBlend
80+
Graphics.GL.AMD.FramebufferMultisampleAdvanced
8081
Graphics.GL.AMD.FramebufferSamplePositions
8182
Graphics.GL.AMD.GPUShaderHalfFloat
8283
Graphics.GL.AMD.GPUShaderInt64

‎RegistryProcessor/OpenGL-Registry

‎src/Graphics/GL/AMD.hs

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ module Graphics.GL.AMD (
1717
module Graphics.GL.AMD.DebugOutput,
1818
module Graphics.GL.AMD.DepthClampSeparate,
1919
module Graphics.GL.AMD.DrawBuffersBlend,
20+
module Graphics.GL.AMD.FramebufferMultisampleAdvanced,
2021
module Graphics.GL.AMD.FramebufferSamplePositions,
2122
module Graphics.GL.AMD.GPUShaderHalfFloat,
2223
module Graphics.GL.AMD.GPUShaderInt64,
@@ -39,6 +40,7 @@ import Graphics.GL.AMD.BlendMinmaxFactor
3940
import Graphics.GL.AMD.DebugOutput
4041
import Graphics.GL.AMD.DepthClampSeparate
4142
import Graphics.GL.AMD.DrawBuffersBlend
43+
import Graphics.GL.AMD.FramebufferMultisampleAdvanced
4244
import Graphics.GL.AMD.FramebufferSamplePositions
4345
import Graphics.GL.AMD.GPUShaderHalfFloat
4446
import Graphics.GL.AMD.GPUShaderInt64

‎src/Graphics/GL/Core30.hs

+3
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@ module Graphics.GL.Core30 (
431431
pattern GL_HINT_BIT,
432432
pattern GL_INCR,
433433
pattern GL_INCR_WRAP,
434+
pattern GL_INDEX,
434435
pattern GL_INDEX_ARRAY,
435436
pattern GL_INDEX_ARRAY_BUFFER_BINDING,
436437
pattern GL_INDEX_ARRAY_POINTER,
@@ -1034,9 +1035,11 @@ module Graphics.GL.Core30 (
10341035
pattern GL_TEXTURE_GREEN_TYPE,
10351036
pattern GL_TEXTURE_HEIGHT,
10361037
pattern GL_TEXTURE_INTENSITY_SIZE,
1038+
pattern GL_TEXTURE_INTENSITY_TYPE,
10371039
pattern GL_TEXTURE_INTERNAL_FORMAT,
10381040
pattern GL_TEXTURE_LOD_BIAS,
10391041
pattern GL_TEXTURE_LUMINANCE_SIZE,
1042+
pattern GL_TEXTURE_LUMINANCE_TYPE,
10401043
pattern GL_TEXTURE_MAG_FILTER,
10411044
pattern GL_TEXTURE_MATRIX,
10421045
pattern GL_TEXTURE_MAX_LEVEL,

‎src/Graphics/GL/Core31.hs

+3
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@ module Graphics.GL.Core31 (
435435
pattern GL_HINT_BIT,
436436
pattern GL_INCR,
437437
pattern GL_INCR_WRAP,
438+
pattern GL_INDEX,
438439
pattern GL_INDEX_ARRAY,
439440
pattern GL_INDEX_ARRAY_BUFFER_BINDING,
440441
pattern GL_INDEX_ARRAY_POINTER,
@@ -1071,9 +1072,11 @@ module Graphics.GL.Core31 (
10711072
pattern GL_TEXTURE_GREEN_TYPE,
10721073
pattern GL_TEXTURE_HEIGHT,
10731074
pattern GL_TEXTURE_INTENSITY_SIZE,
1075+
pattern GL_TEXTURE_INTENSITY_TYPE,
10741076
pattern GL_TEXTURE_INTERNAL_FORMAT,
10751077
pattern GL_TEXTURE_LOD_BIAS,
10761078
pattern GL_TEXTURE_LUMINANCE_SIZE,
1079+
pattern GL_TEXTURE_LUMINANCE_TYPE,
10771080
pattern GL_TEXTURE_MAG_FILTER,
10781081
pattern GL_TEXTURE_MATRIX,
10791082
pattern GL_TEXTURE_MAX_LEVEL,

‎src/Graphics/GL/ExtensionPredicates.hs

+11
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,17 @@ gl_AMD_draw_buffers_blend :: Bool
9696
gl_AMD_draw_buffers_blend = member "GL_AMD_draw_buffers_blend" extensions
9797
{-# NOINLINE gl_AMD_draw_buffers_blend #-}
9898

99+
-- | Is the <https://www.opengl.org/registry/specs/AMD/framebuffer_multisample_advanced.txt AMD_framebuffer_multisample_advanced> extension supported?
100+
glGetAMDFramebufferMultisampleAdvanced :: MonadIO m => m Bool
101+
glGetAMDFramebufferMultisampleAdvanced = getExtensions >>= (return . member "GL_AMD_framebuffer_multisample_advanced")
102+
103+
-- | Is the <https://www.opengl.org/registry/specs/AMD/framebuffer_multisample_advanced.txt AMD_framebuffer_multisample_advanced> extension supported?
104+
-- Note that in the presence of multiple contexts with different capabilities,
105+
-- this might be wrong. Use 'glGetAMDFramebufferMultisampleAdvanced' in those cases instead.
106+
gl_AMD_framebuffer_multisample_advanced :: Bool
107+
gl_AMD_framebuffer_multisample_advanced = member "GL_AMD_framebuffer_multisample_advanced" extensions
108+
{-# NOINLINE gl_AMD_framebuffer_multisample_advanced #-}
109+
99110
-- | Is the <https://www.opengl.org/registry/specs/AMD/framebuffer_sample_positions.txt AMD_framebuffer_sample_positions> extension supported?
100111
glGetAMDFramebufferSamplePositions :: MonadIO m => m Bool
101112
glGetAMDFramebufferSamplePositions = getExtensions >>= (return . member "GL_AMD_framebuffer_sample_positions")

‎src/Graphics/GL/Functions/F18.hs

+19-16
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ module Graphics.GL.Functions.F18 (
110110
glNamedRenderbufferStorage,
111111
glNamedRenderbufferStorageEXT,
112112
glNamedRenderbufferStorageMultisample,
113+
glNamedRenderbufferStorageMultisampleAdvancedAMD,
113114
glNamedRenderbufferStorageMultisampleCoverageEXT,
114115
glNamedRenderbufferStorageMultisampleEXT,
115116
glNamedStringARB,
116-
glNewList,
117-
glNewObjectBufferATI
117+
glNewList
118118
) where
119119

120120
import Control.Monad.IO.Class ( MonadIO(..) )
@@ -1641,6 +1641,23 @@ glNamedRenderbufferStorageMultisample v1 v2 v3 v4 v5 = liftIO $ dyn617 ptr_glNam
16411641
ptr_glNamedRenderbufferStorageMultisample :: FunPtr (GLuint -> GLsizei -> GLenum -> GLsizei -> GLsizei -> IO ())
16421642
ptr_glNamedRenderbufferStorageMultisample = unsafePerformIO $ getCommand "glNamedRenderbufferStorageMultisample"
16431643

1644+
-- glNamedRenderbufferStorageMultisampleAdvancedAMD ----------------------------
1645+
1646+
glNamedRenderbufferStorageMultisampleAdvancedAMD
1647+
:: MonadIO m
1648+
=> GLuint -- ^ @renderbuffer@ of type @Renderbuffer@.
1649+
-> GLsizei -- ^ @samples@.
1650+
-> GLsizei -- ^ @storageSamples@.
1651+
-> GLenum -- ^ @internalformat@ of type [InternalFormat](Graphics-GL-Groups.html#InternalFormat).
1652+
-> GLsizei -- ^ @width@.
1653+
-> GLsizei -- ^ @height@.
1654+
-> m ()
1655+
glNamedRenderbufferStorageMultisampleAdvancedAMD v1 v2 v3 v4 v5 v6 = liftIO $ dyn618 ptr_glNamedRenderbufferStorageMultisampleAdvancedAMD v1 v2 v3 v4 v5 v6
1656+
1657+
{-# NOINLINE ptr_glNamedRenderbufferStorageMultisampleAdvancedAMD #-}
1658+
ptr_glNamedRenderbufferStorageMultisampleAdvancedAMD :: FunPtr (GLuint -> GLsizei -> GLsizei -> GLenum -> GLsizei -> GLsizei -> IO ())
1659+
ptr_glNamedRenderbufferStorageMultisampleAdvancedAMD = unsafePerformIO $ getCommand "glNamedRenderbufferStorageMultisampleAdvancedAMD"
1660+
16441661
-- glNamedRenderbufferStorageMultisampleCoverageEXT ----------------------------
16451662

16461663
glNamedRenderbufferStorageMultisampleCoverageEXT
@@ -1704,17 +1721,3 @@ glNewList v1 v2 = liftIO $ dyn16 ptr_glNewList v1 v2
17041721
ptr_glNewList :: FunPtr (GLuint -> GLenum -> IO ())
17051722
ptr_glNewList = unsafePerformIO $ getCommand "glNewList"
17061723

1707-
-- glNewObjectBufferATI --------------------------------------------------------
1708-
1709-
glNewObjectBufferATI
1710-
:: MonadIO m
1711-
=> GLsizei -- ^ @size@.
1712-
-> Ptr a -- ^ @pointer@ pointing to @size@ elements of type @a@.
1713-
-> GLenum -- ^ @usage@ of type @ArrayObjectUsageATI@.
1714-
-> m GLuint
1715-
glNewObjectBufferATI v1 v2 v3 = liftIO $ dyn620 ptr_glNewObjectBufferATI v1 v2 v3
1716-
1717-
{-# NOINLINE ptr_glNewObjectBufferATI #-}
1718-
ptr_glNewObjectBufferATI :: FunPtr (GLsizei -> Ptr a -> GLenum -> IO GLuint)
1719-
ptr_glNewObjectBufferATI = unsafePerformIO $ getCommand "glNewObjectBufferATI"
1720-

‎src/Graphics/GL/Functions/F19.hs

+16-21
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
--------------------------------------------------------------------------------
1616

1717
module Graphics.GL.Functions.F19 (
18+
glNewObjectBufferATI,
1819
glNormal3b,
1920
glNormal3bv,
2021
glNormal3d,
@@ -113,8 +114,7 @@ module Graphics.GL.Functions.F19 (
113114
glPixelTransformParameteriEXT,
114115
glPixelTransformParameterivEXT,
115116
glPixelZoom,
116-
glPixelZoomxOES,
117-
glPointAlongPathNV
117+
glPixelZoomxOES
118118
) where
119119

120120
import Control.Monad.IO.Class ( MonadIO(..) )
@@ -123,6 +123,20 @@ import Graphics.GL.Foreign
123123
import Graphics.GL.Types
124124
import System.IO.Unsafe ( unsafePerformIO )
125125

126+
-- glNewObjectBufferATI --------------------------------------------------------
127+
128+
glNewObjectBufferATI
129+
:: MonadIO m
130+
=> GLsizei -- ^ @size@.
131+
-> Ptr a -- ^ @pointer@ pointing to @size@ elements of type @a@.
132+
-> GLenum -- ^ @usage@ of type @ArrayObjectUsageATI@.
133+
-> m GLuint
134+
glNewObjectBufferATI v1 v2 v3 = liftIO $ dyn620 ptr_glNewObjectBufferATI v1 v2 v3
135+
136+
{-# NOINLINE ptr_glNewObjectBufferATI #-}
137+
ptr_glNewObjectBufferATI :: FunPtr (GLsizei -> Ptr a -> GLenum -> IO GLuint)
138+
ptr_glNewObjectBufferATI = unsafePerformIO $ getCommand "glNewObjectBufferATI"
139+
126140
-- glNormal3b ------------------------------------------------------------------
127141

128142
-- | 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
15501564
ptr_glPixelZoomxOES :: FunPtr (GLfixed -> GLfixed -> IO ())
15511565
ptr_glPixelZoomxOES = unsafePerformIO $ getCommand "glPixelZoomxOES"
15521566

1553-
-- glPointAlongPathNV ----------------------------------------------------------
1554-
1555-
glPointAlongPathNV
1556-
:: MonadIO m
1557-
=> GLuint -- ^ @path@ of type @Path@.
1558-
-> GLsizei -- ^ @startSegment@.
1559-
-> GLsizei -- ^ @numSegments@.
1560-
-> GLfloat -- ^ @distance@.
1561-
-> Ptr GLfloat -- ^ @x@ pointing to @1@ element of type @GLfloat@.
1562-
-> Ptr GLfloat -- ^ @y@ pointing to @1@ element of type @GLfloat@.
1563-
-> Ptr GLfloat -- ^ @tangentX@ pointing to @1@ element of type @GLfloat@.
1564-
-> Ptr GLfloat -- ^ @tangentY@ pointing to @1@ element of type @GLfloat@.
1565-
-> m GLboolean -- ^ of type [Boolean](Graphics-GL-Groups.html#Boolean).
1566-
glPointAlongPathNV v1 v2 v3 v4 v5 v6 v7 v8 = liftIO $ dyn636 ptr_glPointAlongPathNV v1 v2 v3 v4 v5 v6 v7 v8
1567-
1568-
{-# NOINLINE ptr_glPointAlongPathNV #-}
1569-
ptr_glPointAlongPathNV :: FunPtr (GLuint -> GLsizei -> GLsizei -> GLfloat -> Ptr GLfloat -> Ptr GLfloat -> Ptr GLfloat -> Ptr GLfloat -> IO GLboolean)
1570-
ptr_glPointAlongPathNV = unsafePerformIO $ getCommand "glPointAlongPathNV"
1571-

‎src/Graphics/GL/Functions/F20.hs

+21-18
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
--------------------------------------------------------------------------------
1616

1717
module Graphics.GL.Functions.F20 (
18+
glPointAlongPathNV,
1819
glPointParameterf,
1920
glPointParameterfARB,
2021
glPointParameterfEXT,
@@ -113,8 +114,7 @@ module Graphics.GL.Functions.F20 (
113114
glProgramUniform1dv,
114115
glProgramUniform1dvEXT,
115116
glProgramUniform1f,
116-
glProgramUniform1fEXT,
117-
glProgramUniform1fv
117+
glProgramUniform1fEXT
118118
) where
119119

120120
import Control.Monad.IO.Class ( MonadIO(..) )
@@ -123,6 +123,25 @@ import Graphics.GL.Foreign
123123
import Graphics.GL.Types
124124
import System.IO.Unsafe ( unsafePerformIO )
125125

126+
-- glPointAlongPathNV ----------------------------------------------------------
127+
128+
glPointAlongPathNV
129+
:: MonadIO m
130+
=> GLuint -- ^ @path@ of type @Path@.
131+
-> GLsizei -- ^ @startSegment@.
132+
-> GLsizei -- ^ @numSegments@.
133+
-> GLfloat -- ^ @distance@.
134+
-> Ptr GLfloat -- ^ @x@ pointing to @1@ element of type @GLfloat@.
135+
-> Ptr GLfloat -- ^ @y@ pointing to @1@ element of type @GLfloat@.
136+
-> Ptr GLfloat -- ^ @tangentX@ pointing to @1@ element of type @GLfloat@.
137+
-> Ptr GLfloat -- ^ @tangentY@ pointing to @1@ element of type @GLfloat@.
138+
-> m GLboolean -- ^ of type [Boolean](Graphics-GL-Groups.html#Boolean).
139+
glPointAlongPathNV v1 v2 v3 v4 v5 v6 v7 v8 = liftIO $ dyn636 ptr_glPointAlongPathNV v1 v2 v3 v4 v5 v6 v7 v8
140+
141+
{-# NOINLINE ptr_glPointAlongPathNV #-}
142+
ptr_glPointAlongPathNV :: FunPtr (GLuint -> GLsizei -> GLsizei -> GLfloat -> Ptr GLfloat -> Ptr GLfloat -> Ptr GLfloat -> Ptr GLfloat -> IO GLboolean)
143+
ptr_glPointAlongPathNV = unsafePerformIO $ getCommand "glPointAlongPathNV"
144+
126145
-- glPointParameterf -----------------------------------------------------------
127146

128147
-- | 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
15951614
ptr_glProgramUniform1fEXT :: FunPtr (GLuint -> GLint -> GLfloat -> IO ())
15961615
ptr_glProgramUniform1fEXT = unsafePerformIO $ getCommand "glProgramUniform1fEXT"
15971616

1598-
-- glProgramUniform1fv ---------------------------------------------------------
1599-
1600-
-- | Manual page for <https://www.opengl.org/sdk/docs/man4/html/glProgramUniform.xhtml OpenGL 4.x>.
1601-
glProgramUniform1fv
1602-
:: MonadIO m
1603-
=> GLuint -- ^ @program@.
1604-
-> GLint -- ^ @location@.
1605-
-> GLsizei -- ^ @count@.
1606-
-> Ptr GLfloat -- ^ @value@ pointing to @count@ elements of type @GLfloat@.
1607-
-> m ()
1608-
glProgramUniform1fv v1 v2 v3 v4 = liftIO $ dyn472 ptr_glProgramUniform1fv v1 v2 v3 v4
1609-
1610-
{-# NOINLINE ptr_glProgramUniform1fv #-}
1611-
ptr_glProgramUniform1fv :: FunPtr (GLuint -> GLint -> GLsizei -> Ptr GLfloat -> IO ())
1612-
ptr_glProgramUniform1fv = unsafePerformIO $ getCommand "glProgramUniform1fv"
1613-

‎src/Graphics/GL/Functions/F21.hs

+18-18
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
--------------------------------------------------------------------------------
1616

1717
module Graphics.GL.Functions.F21 (
18+
glProgramUniform1fv,
1819
glProgramUniform1fvEXT,
1920
glProgramUniform1i,
2021
glProgramUniform1i64ARB,
@@ -113,8 +114,7 @@ module Graphics.GL.Functions.F21 (
113114
glProgramUniformMatrix2dv,
114115
glProgramUniformMatrix2dvEXT,
115116
glProgramUniformMatrix2fv,
116-
glProgramUniformMatrix2fvEXT,
117-
glProgramUniformMatrix2x3dv
117+
glProgramUniformMatrix2fvEXT
118118
) where
119119

120120
import Control.Monad.IO.Class ( MonadIO(..) )
@@ -123,6 +123,22 @@ import Graphics.GL.Foreign
123123
import Graphics.GL.Types
124124
import System.IO.Unsafe ( unsafePerformIO )
125125

126+
-- glProgramUniform1fv ---------------------------------------------------------
127+
128+
-- | Manual page for <https://www.opengl.org/sdk/docs/man4/html/glProgramUniform.xhtml OpenGL 4.x>.
129+
glProgramUniform1fv
130+
:: MonadIO m
131+
=> GLuint -- ^ @program@.
132+
-> GLint -- ^ @location@.
133+
-> GLsizei -- ^ @count@.
134+
-> Ptr GLfloat -- ^ @value@ pointing to @count@ elements of type @GLfloat@.
135+
-> m ()
136+
glProgramUniform1fv v1 v2 v3 v4 = liftIO $ dyn472 ptr_glProgramUniform1fv v1 v2 v3 v4
137+
138+
{-# NOINLINE ptr_glProgramUniform1fv #-}
139+
ptr_glProgramUniform1fv :: FunPtr (GLuint -> GLint -> GLsizei -> Ptr GLfloat -> IO ())
140+
ptr_glProgramUniform1fv = unsafePerformIO $ getCommand "glProgramUniform1fv"
141+
126142
-- glProgramUniform1fvEXT ------------------------------------------------------
127143

128144
-- | This command is an alias for 'glProgramUniform1fv'.
@@ -1686,19 +1702,3 @@ glProgramUniformMatrix2fvEXT v1 v2 v3 v4 v5 = liftIO $ dyn693 ptr_glProgramUnifo
16861702
ptr_glProgramUniformMatrix2fvEXT :: FunPtr (GLuint -> GLint -> GLsizei -> GLboolean -> Ptr GLfloat -> IO ())
16871703
ptr_glProgramUniformMatrix2fvEXT = unsafePerformIO $ getCommand "glProgramUniformMatrix2fvEXT"
16881704

1689-
-- glProgramUniformMatrix2x3dv -------------------------------------------------
1690-
1691-
glProgramUniformMatrix2x3dv
1692-
:: MonadIO m
1693-
=> GLuint -- ^ @program@.
1694-
-> GLint -- ^ @location@.
1695-
-> GLsizei -- ^ @count@.
1696-
-> GLboolean -- ^ @transpose@ of type [Boolean](Graphics-GL-Groups.html#Boolean).
1697-
-> Ptr GLdouble -- ^ @value@ pointing to @count*6@ elements of type @GLdouble@.
1698-
-> m ()
1699-
glProgramUniformMatrix2x3dv v1 v2 v3 v4 v5 = liftIO $ dyn692 ptr_glProgramUniformMatrix2x3dv v1 v2 v3 v4 v5
1700-
1701-
{-# NOINLINE ptr_glProgramUniformMatrix2x3dv #-}
1702-
ptr_glProgramUniformMatrix2x3dv :: FunPtr (GLuint -> GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
1703-
ptr_glProgramUniformMatrix2x3dv = unsafePerformIO $ getCommand "glProgramUniformMatrix2x3dv"
1704-

0 commit comments

Comments
 (0)