Skip to content

Commit 1f9282c

Browse files
svenpannesvenpanne
committed
Updated OpenGL registry to r32749. Bumped version to 3.2.0.0.
1 parent c2f6245 commit 1f9282c

File tree

9 files changed

+126
-3
lines changed

9 files changed

+126
-3
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.0.0
2+
-------
3+
* Updated OpenGL registry to r32749.
4+
15
3.1.0.1
26
-------
37
* Updated warning flag magic for GHC 8.0.

‎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.1.0.0
2+
version: 3.2.0.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
@@ -494,6 +494,7 @@ library
494494
Graphics.GL.NV.VertexProgram3
495495
Graphics.GL.NV.VertexProgram4
496496
Graphics.GL.NV.VideoCapture
497+
Graphics.GL.NV.ViewportSwizzle
497498
Graphics.GL.NVX
498499
Graphics.GL.NVX.ConditionalRender
499500
Graphics.GL.NVX.GPUMemoryInfo

‎RegistryProcessor/OpenGL-Registry‎

‎src/Graphics/GL/ExtensionPredicates.hs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4254,6 +4254,17 @@ gl_NV_video_capture :: Bool
42544254
gl_NV_video_capture = member "GL_NV_video_capture" extensions
42554255
{-# NOINLINE gl_NV_video_capture #-}
42564256

4257+
-- | Is the <https://www.opengl.org/registry/specs/NV/viewport_swizzle.txt NV_viewport_swizzle> extension supported?
4258+
glGetNVViewportSwizzle :: MonadIO m => m Bool
4259+
glGetNVViewportSwizzle = getExtensions >>= (return . member "GL_NV_viewport_swizzle")
4260+
4261+
-- | Is the <https://www.opengl.org/registry/specs/NV/viewport_swizzle.txt NV_viewport_swizzle> extension supported?
4262+
-- Note that in the presence of multiple contexts with different capabilities,
4263+
-- this might be wrong. Use 'glGetNVViewportSwizzle' in those cases instead.
4264+
gl_NV_viewport_swizzle :: Bool
4265+
gl_NV_viewport_swizzle = member "GL_NV_viewport_swizzle" extensions
4266+
{-# NOINLINE gl_NV_viewport_swizzle #-}
4267+
42574268
-- | Is the <https://www.opengl.org/registry/specs/NVX/nvx_conditional_render.txt NVX_conditional_render> extension supported?
42584269
glGetNVXConditionalRender :: MonadIO m => m Bool
42594270
glGetNVXConditionalRender = getExtensions >>= (return . member "GL_NVX_conditional_render")

‎src/Graphics/GL/Functions.hs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3080,6 +3080,7 @@ module Graphics.GL.Functions (
30803080
glViewportIndexedfNV,
30813081
glViewportIndexedfv,
30823082
glViewportIndexedfvNV,
3083+
glViewportSwizzleNV,
30833084
glWaitSync,
30843085
glWaitSyncAPPLE,
30853086
glWeightPathsNV,
@@ -48612,6 +48613,22 @@ glViewportIndexedfvNV v1 v2 = liftIO $ dyn377 ptr_glViewportIndexedfvNV v1 v2
4861248613
ptr_glViewportIndexedfvNV :: FunPtr (GLuint -> Ptr GLfloat -> IO ())
4861348614
ptr_glViewportIndexedfvNV = unsafePerformIO $ getCommand "glViewportIndexedfvNV"
4861448615

48616+
-- glViewportSwizzleNV ---------------------------------------------------------
48617+
48618+
glViewportSwizzleNV
48619+
:: MonadIO m
48620+
=> GLuint -- ^ @index@.
48621+
-> GLenum -- ^ @swizzlex@.
48622+
-> GLenum -- ^ @swizzley@.
48623+
-> GLenum -- ^ @swizzlez@.
48624+
-> GLenum -- ^ @swizzlew@.
48625+
-> m ()
48626+
glViewportSwizzleNV v1 v2 v3 v4 v5 = liftIO $ dyn54 ptr_glViewportSwizzleNV v1 v2 v3 v4 v5
48627+
48628+
{-# NOINLINE ptr_glViewportSwizzleNV #-}
48629+
ptr_glViewportSwizzleNV :: FunPtr (GLuint -> GLenum -> GLenum -> GLenum -> GLenum -> IO ())
48630+
ptr_glViewportSwizzleNV = unsafePerformIO $ getCommand "glViewportSwizzleNV"
48631+
4861548632
-- glWaitSync ------------------------------------------------------------------
4861648633

4861748634
-- | Manual pages for <https://www.opengl.org/sdk/docs/man3/xhtml/glWaitSync.xml OpenGL 3.x> or <https://www.opengl.org/sdk/docs/man4/html/glWaitSync.xhtml OpenGL 4.x>.

‎src/Graphics/GL/Groups.hs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ module Graphics.GL.Groups (
201201
-- * 'Graphics.GL.Tokens.GL_CONTEXT_FLAG_DEBUG_BIT' (alias: 'Graphics.GL.Tokens.GL_CONTEXT_FLAG_DEBUG_BIT_KHR')
202202
-- * 'Graphics.GL.Tokens.GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT'
203203
-- * 'Graphics.GL.Tokens.GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB'
204+
-- * 'Graphics.GL.Tokens.GL_CONTEXT_FLAG_PROTECTED_CONTENT_BIT_EXT'
204205
--
205206
-- === #ContextProfileMask# ContextProfileMask
206207
-- A bitwise combination of several of the following values:

‎src/Graphics/GL/NV.hs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ module Graphics.GL.NV (
8888
module Graphics.GL.NV.VertexProgram2Option,
8989
module Graphics.GL.NV.VertexProgram3,
9090
module Graphics.GL.NV.VertexProgram4,
91-
module Graphics.GL.NV.VideoCapture
91+
module Graphics.GL.NV.VideoCapture,
92+
module Graphics.GL.NV.ViewportSwizzle
9293
) where
9394

9495
import Graphics.GL.NV.BindlessMultiDrawIndirect
@@ -167,3 +168,4 @@ import Graphics.GL.NV.VertexProgram2Option
167168
import Graphics.GL.NV.VertexProgram3
168169
import Graphics.GL.NV.VertexProgram4
169170
import Graphics.GL.NV.VideoCapture
171+
import Graphics.GL.NV.ViewportSwizzle

‎src/Graphics/GL/NV/ViewportSwizzle.hs‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{-# LANGUAGE PatternSynonyms #-}
2+
--------------------------------------------------------------------------------
3+
-- |
4+
-- Module : Graphics.GL.NV.ViewportSwizzle
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.NV.ViewportSwizzle (
15+
-- * Extension Support
16+
glGetNVViewportSwizzle,
17+
gl_NV_viewport_swizzle,
18+
-- * Enums
19+
pattern GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV,
20+
pattern GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV,
21+
pattern GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV,
22+
pattern GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV,
23+
pattern GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV,
24+
pattern GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV,
25+
pattern GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV,
26+
pattern GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV,
27+
pattern GL_VIEWPORT_SWIZZLE_W_NV,
28+
pattern GL_VIEWPORT_SWIZZLE_X_NV,
29+
pattern GL_VIEWPORT_SWIZZLE_Y_NV,
30+
pattern GL_VIEWPORT_SWIZZLE_Z_NV,
31+
-- * Functions
32+
glViewportSwizzleNV
33+
) where
34+
35+
import Graphics.GL.ExtensionPredicates
36+
import Graphics.GL.Tokens
37+
import Graphics.GL.Functions

‎src/Graphics/GL/Tokens.hs‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,34 +739,50 @@ pattern GL_CLIP_DISTANCE0 = 0x3000 :: GLenum
739739

740740
pattern GL_CLIP_DISTANCE0_APPLE = 0x3000 :: GLenum
741741

742+
pattern GL_CLIP_DISTANCE0_EXT = 0x3000 :: GLenum
743+
742744
pattern GL_CLIP_DISTANCE1 = 0x3001 :: GLenum
743745

744746
pattern GL_CLIP_DISTANCE1_APPLE = 0x3001 :: GLenum
745747

748+
pattern GL_CLIP_DISTANCE1_EXT = 0x3001 :: GLenum
749+
746750
pattern GL_CLIP_DISTANCE2 = 0x3002 :: GLenum
747751

748752
pattern GL_CLIP_DISTANCE2_APPLE = 0x3002 :: GLenum
749753

754+
pattern GL_CLIP_DISTANCE2_EXT = 0x3002 :: GLenum
755+
750756
pattern GL_CLIP_DISTANCE3 = 0x3003 :: GLenum
751757

752758
pattern GL_CLIP_DISTANCE3_APPLE = 0x3003 :: GLenum
753759

760+
pattern GL_CLIP_DISTANCE3_EXT = 0x3003 :: GLenum
761+
754762
pattern GL_CLIP_DISTANCE4 = 0x3004 :: GLenum
755763

756764
pattern GL_CLIP_DISTANCE4_APPLE = 0x3004 :: GLenum
757765

766+
pattern GL_CLIP_DISTANCE4_EXT = 0x3004 :: GLenum
767+
758768
pattern GL_CLIP_DISTANCE5 = 0x3005 :: GLenum
759769

760770
pattern GL_CLIP_DISTANCE5_APPLE = 0x3005 :: GLenum
761771

772+
pattern GL_CLIP_DISTANCE5_EXT = 0x3005 :: GLenum
773+
762774
pattern GL_CLIP_DISTANCE6 = 0x3006 :: GLenum
763775

764776
pattern GL_CLIP_DISTANCE6_APPLE = 0x3006 :: GLenum
765777

778+
pattern GL_CLIP_DISTANCE6_EXT = 0x3006 :: GLenum
779+
766780
pattern GL_CLIP_DISTANCE7 = 0x3007 :: GLenum
767781

768782
pattern GL_CLIP_DISTANCE7_APPLE = 0x3007 :: GLenum
769783

784+
pattern GL_CLIP_DISTANCE7_EXT = 0x3007 :: GLenum
785+
770786
pattern GL_CLIP_DISTANCE_NV = 0x8C7A :: GLenum
771787

772788
pattern GL_CLIP_FAR_HINT_PGI = 0x1A221 :: GLenum
@@ -1623,6 +1639,8 @@ pattern GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT = 0x00000001 :: GLbitfield
16231639

16241640
pattern GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR = 0x00000008 :: GLbitfield
16251641

1642+
pattern GL_CONTEXT_FLAG_PROTECTED_CONTENT_BIT_EXT = 0x00000010 :: GLbitfield
1643+
16261644
pattern GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT = 0x00000004 :: GLbitfield
16271645

16281646
pattern GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB = 0x00000004 :: GLbitfield
@@ -4979,6 +4997,8 @@ pattern GL_MAX_CLIP_DISTANCES = 0x0D32 :: GLenum
49794997

49804998
pattern GL_MAX_CLIP_DISTANCES_APPLE = 0x0D32 :: GLenum
49814999

5000+
pattern GL_MAX_CLIP_DISTANCES_EXT = 0x0D32 :: GLenum
5001+
49825002
pattern GL_MAX_CLIP_PLANES = 0x0D32 :: GLenum
49835003

49845004
pattern GL_MAX_CLIP_PLANES_IMG = 0x0D32 :: GLenum
@@ -5001,6 +5021,8 @@ pattern GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS = 0x92D1 :: GLenum
50015021

50025022
pattern GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES = 0x82FA :: GLenum
50035023

5024+
pattern GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES_EXT = 0x82FA :: GLenum
5025+
50045026
pattern GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS = 0x8266 :: GLenum
50055027

50065028
pattern GL_MAX_COMBINED_DIMENSIONS = 0x8282 :: GLenum
@@ -5091,6 +5113,8 @@ pattern GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES = 0x851C :: GLenum
50915113

50925114
pattern GL_MAX_CULL_DISTANCES = 0x82F9 :: GLenum
50935115

5116+
pattern GL_MAX_CULL_DISTANCES_EXT = 0x82F9 :: GLenum
5117+
50945118
pattern GL_MAX_DEBUG_GROUP_STACK_DEPTH = 0x826C :: GLenum
50955119

50965120
pattern GL_MAX_DEBUG_GROUP_STACK_DEPTH_KHR = 0x826C :: GLenum
@@ -9925,6 +9949,8 @@ pattern GL_TEXTURE_PRIORITY = 0x8066 :: GLenum
99259949

99269950
pattern GL_TEXTURE_PRIORITY_EXT = 0x8066 :: GLenum
99279951

9952+
pattern GL_TEXTURE_PROTECTED_EXT = 0x8BFA :: GLenum
9953+
99289954
pattern GL_TEXTURE_RANGE_LENGTH_APPLE = 0x85B7 :: GLenum
99299955

99309956
pattern GL_TEXTURE_RANGE_POINTER_APPLE = 0x85B8 :: GLenum
@@ -11081,6 +11107,30 @@ pattern GL_VIEWPORT_SUBPIXEL_BITS_EXT = 0x825C :: GLenum
1108111107

1108211108
pattern GL_VIEWPORT_SUBPIXEL_BITS_NV = 0x825C :: GLenum
1108311109

11110+
pattern GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV = 0x9357 :: GLenum
11111+
11112+
pattern GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV = 0x9351 :: GLenum
11113+
11114+
pattern GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV = 0x9353 :: GLenum
11115+
11116+
pattern GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV = 0x9355 :: GLenum
11117+
11118+
pattern GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV = 0x9356 :: GLenum
11119+
11120+
pattern GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV = 0x9350 :: GLenum
11121+
11122+
pattern GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV = 0x9352 :: GLenum
11123+
11124+
pattern GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV = 0x9354 :: GLenum
11125+
11126+
pattern GL_VIEWPORT_SWIZZLE_W_NV = 0x935B :: GLenum
11127+
11128+
pattern GL_VIEWPORT_SWIZZLE_X_NV = 0x9358 :: GLenum
11129+
11130+
pattern GL_VIEWPORT_SWIZZLE_Y_NV = 0x9359 :: GLenum
11131+
11132+
pattern GL_VIEWPORT_SWIZZLE_Z_NV = 0x935A :: GLenum
11133+
1108411134
pattern GL_VIEW_CLASS_128_BITS = 0x82C4 :: GLenum
1108511135

1108611136
pattern GL_VIEW_CLASS_16_BITS = 0x82CA :: GLenum

0 commit comments

Comments
 (0)