Skip to content

Commit

Permalink
Updated OpenGL registry to r31903. Bumped version to 2.5.3.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
svenpanne committed Sep 9, 2015
1 parent 1c5d045 commit 667a393
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2.5.3.0
-------
* Updated OpenGL registry to r31903.
* Added `GL_EXT_multisampled_compatibility` tokens and functions (gles2 extension only).

2.5.2.1
-------
* Added CHANGELOG.md to distribution.
Expand Down
2 changes: 1 addition & 1 deletion OpenGLRaw.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: OpenGLRaw
version: 2.5.2.1
version: 2.5.3.0
synopsis: A raw binding for the OpenGL graphics system
description:
OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 graphics system and
Expand Down
2 changes: 1 addition & 1 deletion RegistryProcessor/OpenGL-Registry
45 changes: 45 additions & 0 deletions src/Graphics/Rendering/OpenGL/Raw/Functions.hs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ module Graphics.Rendering.OpenGL.Raw.Functions (
glBindFragDataLocation,
glBindFragDataLocationEXT,
glBindFragDataLocationIndexed,
glBindFragDataLocationIndexedEXT,
glBindFragmentShaderATI,
glBindFramebuffer,
glBindFramebufferEXT,
Expand Down Expand Up @@ -902,6 +903,7 @@ module Graphics.Rendering.OpenGL.Raw.Functions (
glGetFloatv,
glGetFogFuncSGIS,
glGetFragDataIndex,
glGetFragDataIndexEXT,
glGetFragDataLocation,
glGetFragDataLocationEXT,
glGetFragmentLightfvSGIX,
Expand Down Expand Up @@ -1085,6 +1087,7 @@ module Graphics.Rendering.OpenGL.Raw.Functions (
glGetProgramResourceIndex,
glGetProgramResourceLocation,
glGetProgramResourceLocationIndex,
glGetProgramResourceLocationIndexEXT,
glGetProgramResourceName,
glGetProgramResourcefvNV,
glGetProgramResourceiv,
Expand Down Expand Up @@ -4006,6 +4009,21 @@ glBindFragDataLocationIndexed v1 v2 v3 v4 = liftIO $ dyn24 ptr_glBindFragDataLoc
ptr_glBindFragDataLocationIndexed :: FunPtr (GLuint -> GLuint -> GLuint -> Ptr GLchar -> IO ())
ptr_glBindFragDataLocationIndexed = unsafePerformIO $ getCommand "glBindFragDataLocationIndexed"

-- glBindFragDataLocationIndexedEXT --------------------------------------------

glBindFragDataLocationIndexedEXT
:: MonadIO m
=> GLuint -- ^ @program@.
-> GLuint -- ^ @colorNumber@.
-> GLuint -- ^ @index@.
-> Ptr GLchar -- ^ @name@.
-> m ()
glBindFragDataLocationIndexedEXT v1 v2 v3 v4 = liftIO $ dyn24 ptr_glBindFragDataLocationIndexedEXT v1 v2 v3 v4

{-# NOINLINE ptr_glBindFragDataLocationIndexedEXT #-}
ptr_glBindFragDataLocationIndexedEXT :: FunPtr (GLuint -> GLuint -> GLuint -> Ptr GLchar -> IO ())
ptr_glBindFragDataLocationIndexedEXT = unsafePerformIO $ getCommand "glBindFragDataLocationIndexedEXT"

-- glBindFragmentShaderATI -----------------------------------------------------

glBindFragmentShaderATI
Expand Down Expand Up @@ -16199,6 +16217,19 @@ glGetFragDataIndex v1 v2 = liftIO $ dyn306 ptr_glGetFragDataIndex v1 v2
ptr_glGetFragDataIndex :: FunPtr (GLuint -> Ptr GLchar -> IO GLint)
ptr_glGetFragDataIndex = unsafePerformIO $ getCommand "glGetFragDataIndex"

-- glGetFragDataIndexEXT -------------------------------------------------------

glGetFragDataIndexEXT
:: MonadIO m
=> GLuint -- ^ @program@.
-> Ptr GLchar -- ^ @name@.
-> m GLint
glGetFragDataIndexEXT v1 v2 = liftIO $ dyn306 ptr_glGetFragDataIndexEXT v1 v2

{-# NOINLINE ptr_glGetFragDataIndexEXT #-}
ptr_glGetFragDataIndexEXT :: FunPtr (GLuint -> Ptr GLchar -> IO GLint)
ptr_glGetFragDataIndexEXT = unsafePerformIO $ getCommand "glGetFragDataIndexEXT"

-- glGetFragDataLocation -------------------------------------------------------

-- | Manual pages for <https://www.opengl.org/sdk/docs/man3/xhtml/glGetFragDataLocation.xml OpenGL 3.x> or <https://www.opengl.org/sdk/docs/man4/html/glGetFragDataLocation.xhtml OpenGL 4.x>
Expand Down Expand Up @@ -18882,6 +18913,20 @@ glGetProgramResourceLocationIndex v1 v2 v3 = liftIO $ dyn392 ptr_glGetProgramRes
ptr_glGetProgramResourceLocationIndex :: FunPtr (GLuint -> GLenum -> Ptr GLchar -> IO GLint)
ptr_glGetProgramResourceLocationIndex = unsafePerformIO $ getCommand "glGetProgramResourceLocationIndex"

-- glGetProgramResourceLocationIndexEXT ----------------------------------------

glGetProgramResourceLocationIndexEXT
:: MonadIO m
=> GLuint -- ^ @program@.
-> GLenum -- ^ @programInterface@.
-> Ptr GLchar -- ^ @name@ pointing to @COMPSIZE(name)@ elements of type @GLchar@.
-> m GLint
glGetProgramResourceLocationIndexEXT v1 v2 v3 = liftIO $ dyn392 ptr_glGetProgramResourceLocationIndexEXT v1 v2 v3

{-# NOINLINE ptr_glGetProgramResourceLocationIndexEXT #-}
ptr_glGetProgramResourceLocationIndexEXT :: FunPtr (GLuint -> GLenum -> Ptr GLchar -> IO GLint)
ptr_glGetProgramResourceLocationIndexEXT = unsafePerformIO $ getCommand "glGetProgramResourceLocationIndexEXT"

-- glGetProgramResourceName ----------------------------------------------------

-- | Manual page for <https://www.opengl.org/sdk/docs/man4/html/glGetProgramResourceName.xhtml OpenGL 4.x>
Expand Down
21 changes: 21 additions & 0 deletions src/Graphics/Rendering/OpenGL/Raw/Tokens.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6701,6 +6701,9 @@ gl_LOCATION_COMPONENT = 0x934A
gl_LOCATION_INDEX :: GLenum
gl_LOCATION_INDEX = 0x930F

gl_LOCATION_INDEX_EXT :: GLenum
gl_LOCATION_INDEX_EXT = 0x930F

gl_LOGIC_OP :: GLenum
gl_LOGIC_OP = 0x0BF1

Expand Down Expand Up @@ -7661,6 +7664,9 @@ gl_MAX_DRAW_BUFFERS_NV = 0x8824
gl_MAX_DUAL_SOURCE_DRAW_BUFFERS :: GLenum
gl_MAX_DUAL_SOURCE_DRAW_BUFFERS = 0x88FC

gl_MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT :: GLenum
gl_MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT = 0x88FC

gl_MAX_ELEMENTS_INDICES :: GLenum
gl_MAX_ELEMENTS_INDICES = 0x80E9

Expand Down Expand Up @@ -9431,9 +9437,15 @@ gl_ONE_MINUS_DST_COLOR = 0x0307
gl_ONE_MINUS_SRC1_ALPHA :: GLenum
gl_ONE_MINUS_SRC1_ALPHA = 0x88FB

gl_ONE_MINUS_SRC1_ALPHA_EXT :: GLenum
gl_ONE_MINUS_SRC1_ALPHA_EXT = 0x88FB

gl_ONE_MINUS_SRC1_COLOR :: GLenum
gl_ONE_MINUS_SRC1_COLOR = 0x88FA

gl_ONE_MINUS_SRC1_COLOR_EXT :: GLenum
gl_ONE_MINUS_SRC1_COLOR_EXT = 0x88FA

gl_ONE_MINUS_SRC_ALPHA :: GLenum
gl_ONE_MINUS_SRC_ALPHA = 0x0303

Expand Down Expand Up @@ -13181,9 +13193,15 @@ gl_SRC0_RGB = 0x8580
gl_SRC1_ALPHA :: GLenum
gl_SRC1_ALPHA = 0x8589

gl_SRC1_ALPHA_EXT :: GLenum
gl_SRC1_ALPHA_EXT = 0x8589

gl_SRC1_COLOR :: GLenum
gl_SRC1_COLOR = 0x88F9

gl_SRC1_COLOR_EXT :: GLenum
gl_SRC1_COLOR_EXT = 0x88F9

gl_SRC1_RGB :: GLenum
gl_SRC1_RGB = 0x8581

Expand All @@ -13199,6 +13217,9 @@ gl_SRC_ALPHA = 0x0302
gl_SRC_ALPHA_SATURATE :: GLenum
gl_SRC_ALPHA_SATURATE = 0x0308

gl_SRC_ALPHA_SATURATE_EXT :: GLenum
gl_SRC_ALPHA_SATURATE_EXT = 0x0308

gl_SRC_ATOP_NV :: GLenum
gl_SRC_ATOP_NV = 0x928E

Expand Down

0 comments on commit 667a393

Please sign in to comment.