Skip to content

Commit 901c20e

Browse files
svenpannesvenpanne
committed
Updated OpenGL registry to r33189. Bumped version to 3.2.3.0.
1 parent ac314c9 commit 901c20e

37 files changed

+2243
-2037
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
3.2.3.0
2+
-------
3+
* Updated OpenGL registry to r33189.
4+
15
3.2.2.0
26
-------
37
* Updated OpenGL registry to r33080.

‎OpenGLRaw.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: OpenGLRaw
2-
version: 3.2.2.0
2+
version: 3.2.3.0
33
synopsis: A raw binding for the OpenGL graphics system
44
description:
55
OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 graphics system and
@@ -74,6 +74,7 @@ library
7474
Graphics.GL.AMD.DebugOutput
7575
Graphics.GL.AMD.DepthClampSeparate
7676
Graphics.GL.AMD.DrawBuffersBlend
77+
Graphics.GL.AMD.GPUShaderHalfFloat
7778
Graphics.GL.AMD.GPUShaderInt64
7879
Graphics.GL.AMD.InterleavedElements
7980
Graphics.GL.AMD.MultiDrawIndirect

‎RegistryProcessor/OpenGL-Registry

‎src/Graphics/GL/AMD.hs

Lines changed: 2 additions & 0 deletions
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.GPUShaderHalfFloat,
2021
module Graphics.GL.AMD.GPUShaderInt64,
2122
module Graphics.GL.AMD.InterleavedElements,
2223
module Graphics.GL.AMD.MultiDrawIndirect,
@@ -37,6 +38,7 @@ import Graphics.GL.AMD.BlendMinmaxFactor
3738
import Graphics.GL.AMD.DebugOutput
3839
import Graphics.GL.AMD.DepthClampSeparate
3940
import Graphics.GL.AMD.DrawBuffersBlend
41+
import Graphics.GL.AMD.GPUShaderHalfFloat
4042
import Graphics.GL.AMD.GPUShaderInt64
4143
import Graphics.GL.AMD.InterleavedElements
4244
import Graphics.GL.AMD.MultiDrawIndirect

‎src/Graphics/GL/AMD/GPUShaderHalfFloat.hs

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{-# LANGUAGE PatternSynonyms #-}
2+
--------------------------------------------------------------------------------
3+
-- |
4+
-- Module : Graphics.GL.AMD.GPUShaderHalfFloat
5+
-- Copyright : (c) Sven Panne 2016
6+
-- License : BSD3
7+
--
8+
-- Maintainer : Sven Panne <[email protected]>
9+
-- Stability : stable
10+
-- Portability : portable
11+
--
12+
--------------------------------------------------------------------------------
13+
14+
module Graphics.GL.AMD.GPUShaderHalfFloat (
15+
-- * Extension Support
16+
glGetAMDGPUShaderHalfFloat,
17+
gl_AMD_gpu_shader_half_float,
18+
-- * Enums
19+
pattern GL_FLOAT16_MAT2_AMD,
20+
pattern GL_FLOAT16_MAT2x3_AMD,
21+
pattern GL_FLOAT16_MAT2x4_AMD,
22+
pattern GL_FLOAT16_MAT3_AMD,
23+
pattern GL_FLOAT16_MAT3x2_AMD,
24+
pattern GL_FLOAT16_MAT3x4_AMD,
25+
pattern GL_FLOAT16_MAT4_AMD,
26+
pattern GL_FLOAT16_MAT4x2_AMD,
27+
pattern GL_FLOAT16_MAT4x3_AMD,
28+
pattern GL_FLOAT16_NV,
29+
pattern GL_FLOAT16_VEC2_NV,
30+
pattern GL_FLOAT16_VEC3_NV,
31+
pattern GL_FLOAT16_VEC4_NV
32+
) where
33+
34+
import Graphics.GL.ExtensionPredicates
35+
import Graphics.GL.Tokens

‎src/Graphics/GL/ExtensionPredicates.hs

Lines changed: 11 additions & 0 deletions
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/gpu_shader_half_float.txt AMD_gpu_shader_half_float> extension supported?
100+
glGetAMDGPUShaderHalfFloat :: MonadIO m => m Bool
101+
glGetAMDGPUShaderHalfFloat = getExtensions >>= (return . member "GL_AMD_gpu_shader_half_float")
102+
103+
-- | Is the <https://www.opengl.org/registry/specs/AMD/gpu_shader_half_float.txt AMD_gpu_shader_half_float> extension supported?
104+
-- Note that in the presence of multiple contexts with different capabilities,
105+
-- this might be wrong. Use 'glGetAMDGPUShaderHalfFloat' in those cases instead.
106+
gl_AMD_gpu_shader_half_float :: Bool
107+
gl_AMD_gpu_shader_half_float = member "GL_AMD_gpu_shader_half_float" extensions
108+
{-# NOINLINE gl_AMD_gpu_shader_half_float #-}
109+
99110
-- | Is the <https://www.opengl.org/registry/specs/AMD/gpu_shader_int64.txt AMD_gpu_shader_int64> extension supported?
100111
glGetAMDGPUShaderInt64 :: MonadIO m => m Bool
101112
glGetAMDGPUShaderInt64 = getExtensions >>= (return . member "GL_AMD_gpu_shader_int64")

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

Lines changed: 43 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ module Graphics.GL.Functions.F03 (
2020
glClearPixelLocalStorageuiEXT,
2121
glClearStencil,
2222
glClearTexImage,
23+
glClearTexImageEXT,
2324
glClearTexSubImage,
25+
glClearTexSubImageEXT,
2426
glClientActiveTexture,
2527
glClientActiveTextureARB,
2628
glClientActiveVertexStreamATI,
@@ -112,9 +114,7 @@ module Graphics.GL.Functions.F03 (
112114
glColorTableParameterivSGI,
113115
glColorTableSGI,
114116
glCombinerInputNV,
115-
glCombinerOutputNV,
116-
glCombinerParameterfNV,
117-
glCombinerParameterfvNV
117+
glCombinerOutputNV
118118
) where
119119

120120
import Control.Monad.IO.Class ( MonadIO(..) )
@@ -199,6 +199,23 @@ glClearTexImage v1 v2 v3 v4 v5 = liftIO $ dyn90 ptr_glClearTexImage v1 v2 v3 v4
199199
ptr_glClearTexImage :: FunPtr (GLuint -> GLint -> GLenum -> GLenum -> Ptr a -> IO ())
200200
ptr_glClearTexImage = unsafePerformIO $ getCommand "glClearTexImage"
201201

202+
-- glClearTexImageEXT ----------------------------------------------------------
203+
204+
-- | This command is an alias for 'glClearTexImage'.
205+
glClearTexImageEXT
206+
:: MonadIO m
207+
=> GLuint -- ^ @texture@.
208+
-> GLint -- ^ @level@.
209+
-> GLenum -- ^ @format@.
210+
-> GLenum -- ^ @type@.
211+
-> Ptr a -- ^ @data@ pointing to @COMPSIZE(format,type)@ elements of type @a@.
212+
-> m ()
213+
glClearTexImageEXT v1 v2 v3 v4 v5 = liftIO $ dyn90 ptr_glClearTexImageEXT v1 v2 v3 v4 v5
214+
215+
{-# NOINLINE ptr_glClearTexImageEXT #-}
216+
ptr_glClearTexImageEXT :: FunPtr (GLuint -> GLint -> GLenum -> GLenum -> Ptr a -> IO ())
217+
ptr_glClearTexImageEXT = unsafePerformIO $ getCommand "glClearTexImageEXT"
218+
202219
-- glClearTexSubImage ----------------------------------------------------------
203220

204221
-- | Manual page for <https://www.opengl.org/sdk/docs/man4/html/glClearTexSubImage.xhtml OpenGL 4.x>.
@@ -222,6 +239,29 @@ glClearTexSubImage v1 v2 v3 v4 v5 v6 v7 v8 v9 v10 v11 = liftIO $ dyn91 ptr_glCle
222239
ptr_glClearTexSubImage :: FunPtr (GLuint -> GLint -> GLint -> GLint -> GLint -> GLsizei -> GLsizei -> GLsizei -> GLenum -> GLenum -> Ptr a -> IO ())
223240
ptr_glClearTexSubImage = unsafePerformIO $ getCommand "glClearTexSubImage"
224241

242+
-- glClearTexSubImageEXT -------------------------------------------------------
243+
244+
-- | This command is an alias for 'glClearTexSubImage'.
245+
glClearTexSubImageEXT
246+
:: MonadIO m
247+
=> GLuint -- ^ @texture@.
248+
-> GLint -- ^ @level@.
249+
-> GLint -- ^ @xoffset@.
250+
-> GLint -- ^ @yoffset@.
251+
-> GLint -- ^ @zoffset@.
252+
-> GLsizei -- ^ @width@.
253+
-> GLsizei -- ^ @height@.
254+
-> GLsizei -- ^ @depth@.
255+
-> GLenum -- ^ @format@.
256+
-> GLenum -- ^ @type@.
257+
-> Ptr a -- ^ @data@ pointing to @COMPSIZE(format,type)@ elements of type @a@.
258+
-> m ()
259+
glClearTexSubImageEXT v1 v2 v3 v4 v5 v6 v7 v8 v9 v10 v11 = liftIO $ dyn91 ptr_glClearTexSubImageEXT v1 v2 v3 v4 v5 v6 v7 v8 v9 v10 v11
260+
261+
{-# NOINLINE ptr_glClearTexSubImageEXT #-}
262+
ptr_glClearTexSubImageEXT :: FunPtr (GLuint -> GLint -> GLint -> GLint -> GLint -> GLsizei -> GLsizei -> GLsizei -> GLenum -> GLenum -> Ptr a -> IO ())
263+
ptr_glClearTexSubImageEXT = unsafePerformIO $ getCommand "glClearTexSubImageEXT"
264+
225265
-- glClientActiveTexture -------------------------------------------------------
226266

227267
-- | Manual page for <https://www.opengl.org/sdk/docs/man2/xhtml/glClientActiveTexture.xml OpenGL 2.x>.
@@ -1590,29 +1630,3 @@ glCombinerOutputNV v1 v2 v3 v4 v5 v6 v7 v8 v9 v10 = liftIO $ dyn135 ptr_glCombin
15901630
ptr_glCombinerOutputNV :: FunPtr (GLenum -> GLenum -> GLenum -> GLenum -> GLenum -> GLenum -> GLenum -> GLboolean -> GLboolean -> GLboolean -> IO ())
15911631
ptr_glCombinerOutputNV = unsafePerformIO $ getCommand "glCombinerOutputNV"
15921632

1593-
-- glCombinerParameterfNV ------------------------------------------------------
1594-
1595-
glCombinerParameterfNV
1596-
:: MonadIO m
1597-
=> GLenum -- ^ @pname@ of type @CombinerParameterNV@.
1598-
-> GLfloat -- ^ @param@.
1599-
-> m ()
1600-
glCombinerParameterfNV v1 v2 = liftIO $ dyn0 ptr_glCombinerParameterfNV v1 v2
1601-
1602-
{-# NOINLINE ptr_glCombinerParameterfNV #-}
1603-
ptr_glCombinerParameterfNV :: FunPtr (GLenum -> GLfloat -> IO ())
1604-
ptr_glCombinerParameterfNV = unsafePerformIO $ getCommand "glCombinerParameterfNV"
1605-
1606-
-- glCombinerParameterfvNV -----------------------------------------------------
1607-
1608-
glCombinerParameterfvNV
1609-
:: MonadIO m
1610-
=> GLenum -- ^ @pname@ of type @CombinerParameterNV@.
1611-
-> Ptr GLfloat -- ^ @params@ pointing to @COMPSIZE(pname)@ elements of type @CheckedFloat32@.
1612-
-> m ()
1613-
glCombinerParameterfvNV v1 v2 = liftIO $ dyn94 ptr_glCombinerParameterfvNV v1 v2
1614-
1615-
{-# NOINLINE ptr_glCombinerParameterfvNV #-}
1616-
ptr_glCombinerParameterfvNV :: FunPtr (GLenum -> Ptr GLfloat -> IO ())
1617-
ptr_glCombinerParameterfvNV = unsafePerformIO $ getCommand "glCombinerParameterfvNV"
1618-

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

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
--------------------------------------------------------------------------------
1616

1717
module Graphics.GL.Functions.F04 (
18+
glCombinerParameterfNV,
19+
glCombinerParameterfvNV,
1820
glCombinerParameteriNV,
1921
glCombinerParameterivNV,
2022
glCombinerStageParameterfvNV,
@@ -112,9 +114,7 @@ module Graphics.GL.Functions.F04 (
112114
glCopyTextureSubImage3DEXT,
113115
glCoverFillPathInstancedNV,
114116
glCoverFillPathNV,
115-
glCoverStrokePathInstancedNV,
116-
glCoverStrokePathNV,
117-
glCoverageMaskNV
117+
glCoverStrokePathInstancedNV
118118
) where
119119

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

126+
-- glCombinerParameterfNV ------------------------------------------------------
127+
128+
glCombinerParameterfNV
129+
:: MonadIO m
130+
=> GLenum -- ^ @pname@ of type @CombinerParameterNV@.
131+
-> GLfloat -- ^ @param@.
132+
-> m ()
133+
glCombinerParameterfNV v1 v2 = liftIO $ dyn0 ptr_glCombinerParameterfNV v1 v2
134+
135+
{-# NOINLINE ptr_glCombinerParameterfNV #-}
136+
ptr_glCombinerParameterfNV :: FunPtr (GLenum -> GLfloat -> IO ())
137+
ptr_glCombinerParameterfNV = unsafePerformIO $ getCommand "glCombinerParameterfNV"
138+
139+
-- glCombinerParameterfvNV -----------------------------------------------------
140+
141+
glCombinerParameterfvNV
142+
:: MonadIO m
143+
=> GLenum -- ^ @pname@ of type @CombinerParameterNV@.
144+
-> Ptr GLfloat -- ^ @params@ pointing to @COMPSIZE(pname)@ elements of type @CheckedFloat32@.
145+
-> m ()
146+
glCombinerParameterfvNV v1 v2 = liftIO $ dyn94 ptr_glCombinerParameterfvNV v1 v2
147+
148+
{-# NOINLINE ptr_glCombinerParameterfvNV #-}
149+
ptr_glCombinerParameterfvNV :: FunPtr (GLenum -> Ptr GLfloat -> IO ())
150+
ptr_glCombinerParameterfvNV = unsafePerformIO $ getCommand "glCombinerParameterfvNV"
151+
126152
-- glCombinerParameteriNV ------------------------------------------------------
127153

128154
glCombinerParameteriNV
@@ -1938,28 +1964,3 @@ glCoverStrokePathInstancedNV v1 v2 v3 v4 v5 v6 v7 = liftIO $ dyn190 ptr_glCoverS
19381964
ptr_glCoverStrokePathInstancedNV :: FunPtr (GLsizei -> GLenum -> Ptr a -> GLuint -> GLenum -> GLenum -> Ptr GLfloat -> IO ())
19391965
ptr_glCoverStrokePathInstancedNV = unsafePerformIO $ getCommand "glCoverStrokePathInstancedNV"
19401966

1941-
-- glCoverStrokePathNV ---------------------------------------------------------
1942-
1943-
glCoverStrokePathNV
1944-
:: MonadIO m
1945-
=> GLuint -- ^ @path@ of type @Path@.
1946-
-> GLenum -- ^ @coverMode@ of type @PathCoverMode@.
1947-
-> m ()
1948-
glCoverStrokePathNV v1 v2 = liftIO $ dyn15 ptr_glCoverStrokePathNV v1 v2
1949-
1950-
{-# NOINLINE ptr_glCoverStrokePathNV #-}
1951-
ptr_glCoverStrokePathNV :: FunPtr (GLuint -> GLenum -> IO ())
1952-
ptr_glCoverStrokePathNV = unsafePerformIO $ getCommand "glCoverStrokePathNV"
1953-
1954-
-- glCoverageMaskNV ------------------------------------------------------------
1955-
1956-
glCoverageMaskNV
1957-
:: MonadIO m
1958-
=> GLboolean -- ^ @mask@.
1959-
-> m ()
1960-
glCoverageMaskNV v1 = liftIO $ dyn191 ptr_glCoverageMaskNV v1
1961-
1962-
{-# NOINLINE ptr_glCoverageMaskNV #-}
1963-
ptr_glCoverageMaskNV :: FunPtr (GLboolean -> IO ())
1964-
ptr_glCoverageMaskNV = unsafePerformIO $ getCommand "glCoverageMaskNV"
1965-

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

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
--------------------------------------------------------------------------------
1616

1717
module Graphics.GL.Functions.F05 (
18+
glCoverStrokePathNV,
19+
glCoverageMaskNV,
1820
glCoverageModulationNV,
1921
glCoverageModulationTableNV,
2022
glCoverageOperationNV,
@@ -112,9 +114,7 @@ module Graphics.GL.Functions.F05 (
112114
glDepthRangeIndexedfNV,
113115
glDepthRangeIndexedfOES,
114116
glDepthRangedNV,
115-
glDepthRangef,
116-
glDepthRangefOES,
117-
glDepthRangex
117+
glDepthRangef
118118
) where
119119

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

126+
-- glCoverStrokePathNV ---------------------------------------------------------
127+
128+
glCoverStrokePathNV
129+
:: MonadIO m
130+
=> GLuint -- ^ @path@ of type @Path@.
131+
-> GLenum -- ^ @coverMode@ of type @PathCoverMode@.
132+
-> m ()
133+
glCoverStrokePathNV v1 v2 = liftIO $ dyn15 ptr_glCoverStrokePathNV v1 v2
134+
135+
{-# NOINLINE ptr_glCoverStrokePathNV #-}
136+
ptr_glCoverStrokePathNV :: FunPtr (GLuint -> GLenum -> IO ())
137+
ptr_glCoverStrokePathNV = unsafePerformIO $ getCommand "glCoverStrokePathNV"
138+
139+
-- glCoverageMaskNV ------------------------------------------------------------
140+
141+
glCoverageMaskNV
142+
:: MonadIO m
143+
=> GLboolean -- ^ @mask@.
144+
-> m ()
145+
glCoverageMaskNV v1 = liftIO $ dyn191 ptr_glCoverageMaskNV v1
146+
147+
{-# NOINLINE ptr_glCoverageMaskNV #-}
148+
ptr_glCoverageMaskNV :: FunPtr (GLboolean -> IO ())
149+
ptr_glCoverageMaskNV = unsafePerformIO $ getCommand "glCoverageMaskNV"
150+
126151
-- glCoverageModulationNV ------------------------------------------------------
127152

128153
glCoverageModulationNV
@@ -1493,30 +1518,3 @@ glDepthRangef v1 v2 = liftIO $ dyn222 ptr_glDepthRangef v1 v2
14931518
ptr_glDepthRangef :: FunPtr (GLfloat -> GLfloat -> IO ())
14941519
ptr_glDepthRangef = unsafePerformIO $ getCommand "glDepthRangef"
14951520

1496-
-- glDepthRangefOES ------------------------------------------------------------
1497-
1498-
-- | This command is an alias for 'glDepthRangef'.
1499-
glDepthRangefOES
1500-
:: MonadIO m
1501-
=> GLclampf -- ^ @n@ of type @ClampedFloat32@.
1502-
-> GLclampf -- ^ @f@ of type @ClampedFloat32@.
1503-
-> m ()
1504-
glDepthRangefOES v1 v2 = liftIO $ dyn223 ptr_glDepthRangefOES v1 v2
1505-
1506-
{-# NOINLINE ptr_glDepthRangefOES #-}
1507-
ptr_glDepthRangefOES :: FunPtr (GLclampf -> GLclampf -> IO ())
1508-
ptr_glDepthRangefOES = unsafePerformIO $ getCommand "glDepthRangefOES"
1509-
1510-
-- glDepthRangex ---------------------------------------------------------------
1511-
1512-
glDepthRangex
1513-
:: MonadIO m
1514-
=> GLfixed -- ^ @n@.
1515-
-> GLfixed -- ^ @f@.
1516-
-> m ()
1517-
glDepthRangex v1 v2 = liftIO $ dyn224 ptr_glDepthRangex v1 v2
1518-
1519-
{-# NOINLINE ptr_glDepthRangex #-}
1520-
ptr_glDepthRangex :: FunPtr (GLfixed -> GLfixed -> IO ())
1521-
ptr_glDepthRangex = unsafePerformIO $ getCommand "glDepthRangex"
1522-

0 commit comments

Comments
 (0)