Skip to content

Commit 0fd6682

Browse files
committed
Updated OpenGL registry to r33061. Bumped version to 3.2.1.0.
1 parent 1f9282c commit 0fd6682

15 files changed

+280
-2
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.1.0
2+
-------
3+
* Updated OpenGL registry to r33061.
4+
15
3.2.0.0
26
-------
37
* Updated OpenGL registry to r32749.

OpenGLRaw.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: OpenGLRaw
2-
version: 3.2.0.0
2+
version: 3.2.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.5 graphics system and

src/Graphics/GL/EXT.hs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ module Graphics.GL.EXT (
103103
module Graphics.GL.EXT.VertexAttrib64Bit,
104104
module Graphics.GL.EXT.VertexShader,
105105
module Graphics.GL.EXT.VertexWeighting,
106+
module Graphics.GL.EXT.WindowRectangles,
106107
module Graphics.GL.EXT.X11SyncObject
107108
) where
108109

@@ -196,4 +197,5 @@ import Graphics.GL.EXT.VertexArrayBGRA
196197
import Graphics.GL.EXT.VertexAttrib64Bit
197198
import Graphics.GL.EXT.VertexShader
198199
import Graphics.GL.EXT.VertexWeighting
200+
import Graphics.GL.EXT.WindowRectangles
199201
import Graphics.GL.EXT.X11SyncObject
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{-# LANGUAGE PatternSynonyms #-}
2+
--------------------------------------------------------------------------------
3+
-- |
4+
-- Module : Graphics.GL.EXT.WindowRectangles
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.EXT.WindowRectangles (
15+
-- * Extension Support
16+
glGetEXTWindowRectangles,
17+
gl_EXT_window_rectangles,
18+
-- * Enums
19+
pattern GL_EXCLUSIVE_EXT,
20+
pattern GL_INCLUSIVE_EXT,
21+
pattern GL_MAX_WINDOW_RECTANGLES_EXT,
22+
pattern GL_NUM_WINDOW_RECTANGLES_EXT,
23+
pattern GL_WINDOW_RECTANGLE_EXT,
24+
pattern GL_WINDOW_RECTANGLE_MODE_EXT,
25+
-- * Functions
26+
glWindowRectanglesEXT
27+
) where
28+
29+
import Graphics.GL.ExtensionPredicates
30+
import Graphics.GL.Tokens
31+
import Graphics.GL.Functions

src/Graphics/GL/ExtensionPredicates.hs

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3066,6 +3066,17 @@ gl_EXT_vertex_weighting :: Bool
30663066
gl_EXT_vertex_weighting = member "GL_EXT_vertex_weighting" extensions
30673067
{-# NOINLINE gl_EXT_vertex_weighting #-}
30683068

3069+
-- | Is the <https://www.opengl.org/registry/specs/EXT/window_rectangles.txt EXT_window_rectangles> extension supported?
3070+
glGetEXTWindowRectangles :: MonadIO m => m Bool
3071+
glGetEXTWindowRectangles = getExtensions >>= (return . member "GL_EXT_window_rectangles")
3072+
3073+
-- | Is the <https://www.opengl.org/registry/specs/EXT/window_rectangles.txt EXT_window_rectangles> extension supported?
3074+
-- Note that in the presence of multiple contexts with different capabilities,
3075+
-- this might be wrong. Use 'glGetEXTWindowRectangles' in those cases instead.
3076+
gl_EXT_window_rectangles :: Bool
3077+
gl_EXT_window_rectangles = member "GL_EXT_window_rectangles" extensions
3078+
{-# NOINLINE gl_EXT_window_rectangles #-}
3079+
30693080
-- | Is the <https://www.opengl.org/registry/specs/EXT/x11_sync_object.txt EXT_x11_sync_object> extension supported?
30703081
glGetEXTX11SyncObject :: MonadIO m => m Bool
30713082
glGetEXTX11SyncObject = getExtensions >>= (return . member "GL_EXT_x11_sync_object")
@@ -3242,6 +3253,17 @@ gl_INGR_interlace_read :: Bool
32423253
gl_INGR_interlace_read = member "GL_INGR_interlace_read" extensions
32433254
{-# NOINLINE gl_INGR_interlace_read #-}
32443255

3256+
-- | Is the <https://www.opengl.org/registry/specs/INTEL/conservative_rasterization.txt INTEL_conservative_rasterization> extension supported?
3257+
glGetINTELConservativeRasterization :: MonadIO m => m Bool
3258+
glGetINTELConservativeRasterization = getExtensions >>= (return . member "GL_INTEL_conservative_rasterization")
3259+
3260+
-- | Is the <https://www.opengl.org/registry/specs/INTEL/conservative_rasterization.txt INTEL_conservative_rasterization> extension supported?
3261+
-- Note that in the presence of multiple contexts with different capabilities,
3262+
-- this might be wrong. Use 'glGetINTELConservativeRasterization' in those cases instead.
3263+
gl_INTEL_conservative_rasterization :: Bool
3264+
gl_INTEL_conservative_rasterization = member "GL_INTEL_conservative_rasterization" extensions
3265+
{-# NOINLINE gl_INTEL_conservative_rasterization #-}
3266+
32453267
-- | Is the <https://www.opengl.org/registry/specs/INTEL/framebuffer_CMAA.txt INTEL_framebuffer_CMAA> extension supported?
32463268
glGetINTELFramebufferCmaa :: MonadIO m => m Bool
32473269
glGetINTELFramebufferCmaa = getExtensions >>= (return . member "GL_INTEL_framebuffer_CMAA")
@@ -3484,6 +3506,17 @@ gl_NV_blend_equation_advanced_coherent :: Bool
34843506
gl_NV_blend_equation_advanced_coherent = member "GL_NV_blend_equation_advanced_coherent" extensions
34853507
{-# NOINLINE gl_NV_blend_equation_advanced_coherent #-}
34863508

3509+
-- | Is the <https://www.opengl.org/registry/specs/NV/clip_space_w_scaling.txt NV_clip_space_w_scaling> extension supported?
3510+
glGetNVClipSpaceWScaling :: MonadIO m => m Bool
3511+
glGetNVClipSpaceWScaling = getExtensions >>= (return . member "GL_NV_clip_space_w_scaling")
3512+
3513+
-- | Is the <https://www.opengl.org/registry/specs/NV/clip_space_w_scaling.txt NV_clip_space_w_scaling> extension supported?
3514+
-- Note that in the presence of multiple contexts with different capabilities,
3515+
-- this might be wrong. Use 'glGetNVClipSpaceWScaling' in those cases instead.
3516+
gl_NV_clip_space_w_scaling :: Bool
3517+
gl_NV_clip_space_w_scaling = member "GL_NV_clip_space_w_scaling" extensions
3518+
{-# NOINLINE gl_NV_clip_space_w_scaling #-}
3519+
34873520
-- | Is the <https://www.opengl.org/registry/specs/NV/command_list.txt NV_command_list> extension supported?
34883521
glGetNVCommandList :: MonadIO m => m Bool
34893522
glGetNVCommandList = getExtensions >>= (return . member "GL_NV_command_list")
@@ -3539,6 +3572,17 @@ gl_NV_conservative_raster_dilate :: Bool
35393572
gl_NV_conservative_raster_dilate = member "GL_NV_conservative_raster_dilate" extensions
35403573
{-# NOINLINE gl_NV_conservative_raster_dilate #-}
35413574

3575+
-- | Is the <https://www.opengl.org/registry/specs/NV/conservative_raster_pre_snap_triangles.txt NV_conservative_raster_pre_snap_triangles> extension supported?
3576+
glGetNVConservativeRasterPreSnapTriangles :: MonadIO m => m Bool
3577+
glGetNVConservativeRasterPreSnapTriangles = getExtensions >>= (return . member "GL_NV_conservative_raster_pre_snap_triangles")
3578+
3579+
-- | Is the <https://www.opengl.org/registry/specs/NV/conservative_raster_pre_snap_triangles.txt NV_conservative_raster_pre_snap_triangles> extension supported?
3580+
-- Note that in the presence of multiple contexts with different capabilities,
3581+
-- this might be wrong. Use 'glGetNVConservativeRasterPreSnapTriangles' in those cases instead.
3582+
gl_NV_conservative_raster_pre_snap_triangles :: Bool
3583+
gl_NV_conservative_raster_pre_snap_triangles = member "GL_NV_conservative_raster_pre_snap_triangles" extensions
3584+
{-# NOINLINE gl_NV_conservative_raster_pre_snap_triangles #-}
3585+
35423586
-- | Is the <https://www.opengl.org/registry/specs/NV/copy_depth_to_color.txt NV_copy_depth_to_color> extension supported?
35433587
glGetNVCopyDepthToColor :: MonadIO m => m Bool
35443588
glGetNVCopyDepthToColor = getExtensions >>= (return . member "GL_NV_copy_depth_to_color")
@@ -3946,6 +3990,17 @@ gl_NV_register_combiners2 :: Bool
39463990
gl_NV_register_combiners2 = member "GL_NV_register_combiners2" extensions
39473991
{-# NOINLINE gl_NV_register_combiners2 #-}
39483992

3993+
-- | Is the <https://www.opengl.org/registry/specs/NV/robustness_video_memory_purge.txt NV_robustness_video_memory_purge> extension supported?
3994+
glGetNVRobustnessVideoMemoryPurge :: MonadIO m => m Bool
3995+
glGetNVRobustnessVideoMemoryPurge = getExtensions >>= (return . member "GL_NV_robustness_video_memory_purge")
3996+
3997+
-- | Is the <https://www.opengl.org/registry/specs/NV/robustness_video_memory_purge.txt NV_robustness_video_memory_purge> extension supported?
3998+
-- Note that in the presence of multiple contexts with different capabilities,
3999+
-- this might be wrong. Use 'glGetNVRobustnessVideoMemoryPurge' in those cases instead.
4000+
gl_NV_robustness_video_memory_purge :: Bool
4001+
gl_NV_robustness_video_memory_purge = member "GL_NV_robustness_video_memory_purge" extensions
4002+
{-# NOINLINE gl_NV_robustness_video_memory_purge #-}
4003+
39494004
-- | Is the <https://www.opengl.org/registry/specs/NV/sample_locations.txt NV_sample_locations> extension supported?
39504005
glGetNVSampleLocations :: MonadIO m => m Bool
39514006
glGetNVSampleLocations = getExtensions >>= (return . member "GL_NV_sample_locations")

src/Graphics/GL/Foreign.hs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -966,6 +966,10 @@ foreign import CALLCONV "dynamic" dyn225
966966
:: FunPtr (GLenum -> GLsizei -> Ptr GLfloat -> IO ())
967967
-> GLenum -> GLsizei -> Ptr GLfloat -> IO ()
968968

969+
foreign import CALLCONV "dynamic" dyn887
970+
:: FunPtr (GLenum -> GLsizei -> Ptr GLint -> IO ())
971+
-> GLenum -> GLsizei -> Ptr GLint -> IO ()
972+
969973
foreign import CALLCONV "dynamic" dyn197
970974
:: FunPtr (GLenum -> GLsizei -> Ptr GLuint -> IO ())
971975
-> GLenum -> GLsizei -> Ptr GLuint -> IO ()

src/Graphics/GL/Functions.hs

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ module Graphics.GL.Functions (
352352
glCompressedTextureSubImage3D,
353353
glCompressedTextureSubImage3DEXT,
354354
glConservativeRasterParameterfNV,
355+
glConservativeRasterParameteriNV,
355356
glConvolutionFilter1D,
356357
glConvolutionFilter1DEXT,
357358
glConvolutionFilter2D,
@@ -3080,6 +3081,7 @@ module Graphics.GL.Functions (
30803081
glViewportIndexedfNV,
30813082
glViewportIndexedfv,
30823083
glViewportIndexedfvNV,
3084+
glViewportPositionWScaleNV,
30833085
glViewportSwizzleNV,
30843086
glWaitSync,
30853087
glWaitSyncAPPLE,
@@ -3150,6 +3152,7 @@ module Graphics.GL.Functions (
31503152
glWindowPos4ivMESA,
31513153
glWindowPos4sMESA,
31523154
glWindowPos4svMESA,
3155+
glWindowRectanglesEXT,
31533156
glWriteMaskEXT
31543157
) where
31553158

@@ -8294,6 +8297,19 @@ glConservativeRasterParameterfNV v1 v2 = liftIO $ dyn0 ptr_glConservativeRasterP
82948297
ptr_glConservativeRasterParameterfNV :: FunPtr (GLenum -> GLfloat -> IO ())
82958298
ptr_glConservativeRasterParameterfNV = unsafePerformIO $ getCommand "glConservativeRasterParameterfNV"
82968299

8300+
-- glConservativeRasterParameteriNV --------------------------------------------
8301+
8302+
glConservativeRasterParameteriNV
8303+
:: MonadIO m
8304+
=> GLenum -- ^ @pname@.
8305+
-> GLint -- ^ @param@.
8306+
-> m ()
8307+
glConservativeRasterParameteriNV v1 v2 = liftIO $ dyn55 ptr_glConservativeRasterParameteriNV v1 v2
8308+
8309+
{-# NOINLINE ptr_glConservativeRasterParameteriNV #-}
8310+
ptr_glConservativeRasterParameteriNV :: FunPtr (GLenum -> GLint -> IO ())
8311+
ptr_glConservativeRasterParameteriNV = unsafePerformIO $ getCommand "glConservativeRasterParameteriNV"
8312+
82978313
-- glConvolutionFilter1D -------------------------------------------------------
82988314

82998315
-- | Manual page for <https://www.opengl.org/sdk/docs/man2/xhtml/glConvolutionFilter1D.xml OpenGL 2.x>.
@@ -48613,6 +48629,20 @@ glViewportIndexedfvNV v1 v2 = liftIO $ dyn377 ptr_glViewportIndexedfvNV v1 v2
4861348629
ptr_glViewportIndexedfvNV :: FunPtr (GLuint -> Ptr GLfloat -> IO ())
4861448630
ptr_glViewportIndexedfvNV = unsafePerformIO $ getCommand "glViewportIndexedfvNV"
4861548631

48632+
-- glViewportPositionWScaleNV --------------------------------------------------
48633+
48634+
glViewportPositionWScaleNV
48635+
:: MonadIO m
48636+
=> GLuint -- ^ @index@.
48637+
-> GLfloat -- ^ @xcoeff@.
48638+
-> GLfloat -- ^ @ycoeff@.
48639+
-> m ()
48640+
glViewportPositionWScaleNV v1 v2 v3 = liftIO $ dyn221 ptr_glViewportPositionWScaleNV v1 v2 v3
48641+
48642+
{-# NOINLINE ptr_glViewportPositionWScaleNV #-}
48643+
ptr_glViewportPositionWScaleNV :: FunPtr (GLuint -> GLfloat -> GLfloat -> IO ())
48644+
ptr_glViewportPositionWScaleNV = unsafePerformIO $ getCommand "glViewportPositionWScaleNV"
48645+
4861648646
-- glViewportSwizzleNV ---------------------------------------------------------
4861748647

4861848648
glViewportSwizzleNV
@@ -49580,6 +49610,20 @@ glWindowPos4svMESA v1 = liftIO $ dyn45 ptr_glWindowPos4svMESA v1
4958049610
ptr_glWindowPos4svMESA :: FunPtr (Ptr GLshort -> IO ())
4958149611
ptr_glWindowPos4svMESA = unsafePerformIO $ getCommand "glWindowPos4svMESA"
4958249612

49613+
-- glWindowRectanglesEXT -------------------------------------------------------
49614+
49615+
glWindowRectanglesEXT
49616+
:: MonadIO m
49617+
=> GLenum -- ^ @mode@.
49618+
-> GLsizei -- ^ @count@.
49619+
-> Ptr GLint -- ^ @box@ pointing to @COMPSIZE(count)@ elements of type @GLint@.
49620+
-> m ()
49621+
glWindowRectanglesEXT v1 v2 v3 = liftIO $ dyn887 ptr_glWindowRectanglesEXT v1 v2 v3
49622+
49623+
{-# NOINLINE ptr_glWindowRectanglesEXT #-}
49624+
ptr_glWindowRectanglesEXT :: FunPtr (GLenum -> GLsizei -> Ptr GLint -> IO ())
49625+
ptr_glWindowRectanglesEXT = unsafePerformIO $ getCommand "glWindowRectanglesEXT"
49626+
4958349627
-- glWriteMaskEXT --------------------------------------------------------------
4958449628

4958549629
glWriteMaskEXT

src/Graphics/GL/INTEL.hs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
--------------------------------------------------------------------------------
1414

1515
module Graphics.GL.INTEL (
16+
module Graphics.GL.INTEL.ConservativeRasterization,
1617
module Graphics.GL.INTEL.FramebufferCmaa,
1718
module Graphics.GL.INTEL.MapTexture,
1819
module Graphics.GL.INTEL.ParallelArrays,
1920
module Graphics.GL.INTEL.PerformanceQuery
2021
) where
2122

23+
import Graphics.GL.INTEL.ConservativeRasterization
2224
import Graphics.GL.INTEL.FramebufferCmaa
2325
import Graphics.GL.INTEL.MapTexture
2426
import Graphics.GL.INTEL.ParallelArrays
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{-# LANGUAGE PatternSynonyms #-}
2+
--------------------------------------------------------------------------------
3+
-- |
4+
-- Module : Graphics.GL.INTEL.ConservativeRasterization
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.INTEL.ConservativeRasterization (
15+
-- * Extension Support
16+
glGetINTELConservativeRasterization,
17+
gl_INTEL_conservative_rasterization,
18+
-- * Enums
19+
pattern GL_CONSERVATIVE_RASTERIZATION_INTEL
20+
) where
21+
22+
import Graphics.GL.ExtensionPredicates
23+
import Graphics.GL.Tokens

0 commit comments

Comments
 (0)