OpenGL 2.2.3.1 → 2.3.0.0

raw patch · 97 files changed

+3137/−17930 lines, 97 filesdep +GLURawdep +ObjectNamedep +OpenGLRawdep ~basesetup-changedPVP ok

version bump matches the API change (PVP)

Dependencies added: GLURaw, ObjectName, OpenGLRaw, StateVar, Tensor

Dependency ranges changed: base

API changes (from Hackage documentation)

Files

• Graphics/Rendering/OpenGL/GL.hs +9/−4
• Graphics/Rendering/OpenGL/GL/Antialiasing.hs +4/−7
• Graphics/Rendering/OpenGL/GL/BasicTypes.hs +0/−110
• Graphics/Rendering/OpenGL/GL/BeginEnd.hs +8/−24
• Graphics/Rendering/OpenGL/GL/Bitmaps.hs +6/−9
• Graphics/Rendering/OpenGL/GL/BlendingFactor.hs +31/−31
• Graphics/Rendering/OpenGL/GL/BufferMode.hs +27/−23
• Graphics/Rendering/OpenGL/GL/BufferObjects.hs +61/−111
• Graphics/Rendering/OpenGL/GL/Capability.hs +122/−102
• Graphics/Rendering/OpenGL/GL/Clipping.hs +14/−17
• Graphics/Rendering/OpenGL/GL/ColorSum.hs +2/−4
• Graphics/Rendering/OpenGL/GL/Colors.hs +89/−118
• Graphics/Rendering/OpenGL/GL/ComparisonFunction.hs +17/−17
• Graphics/Rendering/OpenGL/GL/ControlPoint.hs +32/−27
• Graphics/Rendering/OpenGL/GL/CoordTrans.hs +71/−140
• Graphics/Rendering/OpenGL/GL/DataType.hs +65/−59
• Graphics/Rendering/OpenGL/GL/DisplayLists.hs +24/−42
• Graphics/Rendering/OpenGL/GL/Domain.hs +14/−78
• Graphics/Rendering/OpenGL/GL/EdgeFlag.hs +2/−3
• Graphics/Rendering/OpenGL/GL/Evaluators.hs +23/−58
• Graphics/Rendering/OpenGL/GL/Exception.hs +1/−0
• Graphics/Rendering/OpenGL/GL/Extensions.hs +0/−47
• Graphics/Rendering/OpenGL/GL/Face.hs +7/−7
• Graphics/Rendering/OpenGL/GL/Feedback.hs +31/−32
• Graphics/Rendering/OpenGL/GL/FlushFinish.hs +6/−2
• Graphics/Rendering/OpenGL/GL/Fog.hs +44/−45
• Graphics/Rendering/OpenGL/GL/Framebuffer.hs +25/−85
• Graphics/Rendering/OpenGL/GL/GLboolean.hs +7/−4
• Graphics/Rendering/OpenGL/GL/Hints.hs +23/−24
• Graphics/Rendering/OpenGL/GL/LineSegments.hs +7/−18
• Graphics/Rendering/OpenGL/GL/PeekPoke.hs +2/−2
• Graphics/Rendering/OpenGL/GL/PerFragment.hs +101/−179
• Graphics/Rendering/OpenGL/GL/PixelData.hs +4/−12
• Graphics/Rendering/OpenGL/GL/PixelFormat.hs +51/−43
• Graphics/Rendering/OpenGL/GL/PixelRectangles/ColorTable.hs +57/−73
• Graphics/Rendering/OpenGL/GL/PixelRectangles/Convolution.hs +48/−73
• Graphics/Rendering/OpenGL/GL/PixelRectangles/Histogram.hs +29/−46
• Graphics/Rendering/OpenGL/GL/PixelRectangles/Minmax.hs +16/−37
• Graphics/Rendering/OpenGL/GL/PixelRectangles/PixelMap.hs +32/−60
• Graphics/Rendering/OpenGL/GL/PixelRectangles/PixelStorage.hs +20/−30
• Graphics/Rendering/OpenGL/GL/PixelRectangles/PixelTransfer.hs +48/−55
• Graphics/Rendering/OpenGL/GL/PixelRectangles/Rasterization.hs +9/−15
• Graphics/Rendering/OpenGL/GL/PixelRectangles/Reset.hs +2/−2
• Graphics/Rendering/OpenGL/GL/PixelRectangles/Sink.hs +2/−3
• Graphics/Rendering/OpenGL/GL/PointParameter.hs +10/−18
• Graphics/Rendering/OpenGL/GL/Points.hs +9/−19
• Graphics/Rendering/OpenGL/GL/PolygonMode.hs +7/−7
• Graphics/Rendering/OpenGL/GL/Polygons.hs +14/−38
• Graphics/Rendering/OpenGL/GL/PrimitiveMode.hs +23/−21
• Graphics/Rendering/OpenGL/GL/QueryUtils.hs +524/−442
• Graphics/Rendering/OpenGL/GL/RasterPos.hs +50/−157
• Graphics/Rendering/OpenGL/GL/ReadCopyPixels.hs +13/−23
• Graphics/Rendering/OpenGL/GL/Rectangles.hs +13/−49
• Graphics/Rendering/OpenGL/GL/RenderMode.hs +12/−14
• Graphics/Rendering/OpenGL/GL/SavingState.hs +35/−38
• Graphics/Rendering/OpenGL/GL/Selection.hs +13/−24
• Graphics/Rendering/OpenGL/GL/Shaders.hs +129/−241
• Graphics/Rendering/OpenGL/GL/StateVar.hs +0/−101
• Graphics/Rendering/OpenGL/GL/StringQueries.hs +11/−15
• Graphics/Rendering/OpenGL/GL/Tensor.hs +0/−327
• Graphics/Rendering/OpenGL/GL/Texturing/Application.hs +3/−8
• Graphics/Rendering/OpenGL/GL/Texturing/Environments.hs +100/−98
• Graphics/Rendering/OpenGL/GL/Texturing/Objects.hs +11/−37
• Graphics/Rendering/OpenGL/GL/Texturing/Parameters.hs +53/−64
• Graphics/Rendering/OpenGL/GL/Texturing/PixelInternalFormat.hs +145/−133
• Graphics/Rendering/OpenGL/GL/Texturing/Queries.hs +31/−37
• Graphics/Rendering/OpenGL/GL/Texturing/Specification.hs +17/−86
• Graphics/Rendering/OpenGL/GL/Texturing/TexParameter.hs +43/−50
• Graphics/Rendering/OpenGL/GL/Texturing/TextureTarget.hs +18/−18
• Graphics/Rendering/OpenGL/GL/Texturing/TextureUnit.hs +3/−3
• Graphics/Rendering/OpenGL/GL/VertexArrays.hs +103/−176
• Graphics/Rendering/OpenGL/GL/VertexAttributes.hs +48/−29
• Graphics/Rendering/OpenGL/GL/VertexSpec.hs +227/−723
• Graphics/Rendering/OpenGL/GLU/Errors.hs +2/−4
• Graphics/Rendering/OpenGL/GLU/ErrorsInternal.hs +18/−104
• Graphics/Rendering/OpenGL/GLU/Initialization.hs +10/−27
• Graphics/Rendering/OpenGL/GLU/Matrix.hs +23/−49
• Graphics/Rendering/OpenGL/GLU/Mipmapping.hs +5/−14
• Graphics/Rendering/OpenGL/GLU/NURBS.hs +57/−211
• Graphics/Rendering/OpenGL/GLU/Quadrics.hs +20/−77
• Graphics/Rendering/OpenGL/GLU/Tessellation.hs +39/−227
• OpenGL.buildinfo.in +0/−8
• OpenGL.cabal +104/−116
• README +0/−4
• Setup.hs +1/−5
• aclocal.m4 +0/−288
• cbits/HsOpenGL.c +0/−125
• config.guess +0/−1497
• config.sub +0/−1608
• configure +0/−8007
• configure.ac +0/−97
• include/HsOpenGL.h +0/−45
• include/HsOpenGL.h.in +0/−44
• include/HsOpenGLConfig.h.in +0/−133
• include/HsOpenGLExt.h +0/−29
• include/HsOpenGLTypes.h +0/−42
• install-sh +0/−295

@@ -15,7 +15,7 @@  module Graphics.Rendering.OpenGL.GL (    -- * OpenGL Operation-   module Graphics.Rendering.OpenGL.GL.BasicTypes,+   module Graphics.Rendering.OpenGL.Raw.Core31,    module Graphics.Rendering.OpenGL.GL.BeginEnd,    module Graphics.Rendering.OpenGL.GL.VertexSpec,    module Graphics.Rendering.OpenGL.GL.VertexArrays,@@ -52,12 +52,16 @@    module Graphics.Rendering.OpenGL.GL.Hints,     -- * State and State Requests-   module Graphics.Rendering.OpenGL.GL.StateVar,+   module Data.StateVar,+   module Data.Tensor,    module Graphics.Rendering.OpenGL.GL.StringQueries,    module Graphics.Rendering.OpenGL.GL.SavingState ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes+import Graphics.Rendering.OpenGL.Raw.Core31 (+   GLbitfield,  GLboolean,  GLbyte,  GLchar,  GLclampd,  GLclampf,  GLdouble,+   GLenum,  GLfloat,  GLhalf,  GLint,  GLintptr,  GLshort,  GLsizei,+   GLsizeiptr,  GLubyte,  GLuint,  GLushort ) import Graphics.Rendering.OpenGL.GL.BeginEnd import Graphics.Rendering.OpenGL.GL.VertexSpec import Graphics.Rendering.OpenGL.GL.VertexArrays@@ -90,6 +94,7 @@ import Graphics.Rendering.OpenGL.GL.FlushFinish import Graphics.Rendering.OpenGL.GL.Hints -import Graphics.Rendering.OpenGL.GL.StateVar+import Data.StateVar+import Data.Tensor import Graphics.Rendering.OpenGL.GL.StringQueries import Graphics.Rendering.OpenGL.GL.SavingState

@@ -17,13 +17,10 @@    sampleBuffers, samples, multisample, subpixelBits ) where -import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapMultisample), makeCapability )-import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLsizei, Capability )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetSampleBuffers,GetSamples,GetSubpixelBits), getSizei1 )-import Graphics.Rendering.OpenGL.GL.StateVar (-   GettableStateVar, makeGettableStateVar, StateVar )+import Data.StateVar+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- 

@@ -1,110 +0,0 @@------------------------------------------------------------------------------------ |--- Module      :  Graphics.Rendering.OpenGL.GL.BasicTypes--- Copyright   :  (c) Sven Panne 2002-2009--- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- --- Maintainer  :  sven.panne@aedion.de--- Stability   :  stable--- Portability :  portable------ This module corresponds to section 2.3 (GL Command Sytax) of the OpenGL 2.1--- specs.--------------------------------------------------------------------------------------module Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLboolean, GLbyte, GLubyte, GLchar, GLshort, GLushort, GLint, GLuint,-   GLsizei, GLenum, GLintptr, GLsizeiptr, GLbitfield, GLfloat, GLclampf,-   GLdouble, GLclampd, Capability(..)-) where------------------------------------------------------------------------------------#include "HsOpenGLConfig.h"------------------------------------------------------------------------------------import Data.Int-import Data.Word---- If we don't find modern OpenGL headers at configuration time, make some--- educated guesses here.--#if !defined(HTYPE_GLCHAR) || !defined(HTYPE_GLINTPTR) || !defined(HTYPE_GLSIZEIPTR)-import Foreign.C.Types-#endif--#if !defined(HTYPE_GLCHAR)-#define HTYPE_GLCHAR CChar-#endif--#if !defined(HTYPE_GLINTPTR)-#define HTYPE_GLINTPTR CPtrdiff-#endif--#if !defined(HTYPE_GLSIZEIPTR)-#define HTYPE_GLSIZEIPTR CPtrdiff-#endif-------------------------------------------------------------------------------------- | Boolean (min. 1 bit)-type GLboolean = HTYPE_GLBOOLEAN---- | Signed 2\'s complement binary integer (min. 8 bits)-type GLbyte = HTYPE_GLBYTE---- | Unsigned binary integer (min. 8 bits)-type GLubyte = HTYPE_GLUBYTE---- | Characters making up strings-type GLchar = HTYPE_GLCHAR---- | Signed 2\'s complement binary integer (min. 16 bits)-type GLshort = HTYPE_GLSHORT---- | Unsigned binary integer (min. 16 bits)-type GLushort = HTYPE_GLUSHORT---- | Signed 2\'s complement binary integer (min. 32 bits)-type GLint = HTYPE_GLINT---- | Unsigned binary integer (min. 32 bits)-type GLuint = HTYPE_GLUINT---- | Non-negatitve binary integer size (min. 32 bits)-type GLsizei = HTYPE_GLSIZEI---- | Enumerated binary integer value (min. 32 bits)-type GLenum = HTYPE_GLENUM---- | Signed 2\'s complement binary integer (sufficiently large enough to hold--- any address)-type GLintptr = HTYPE_GLINTPTR---- | Non-negatitve binary integer size (sufficiently large enough to hold any--- address)-type GLsizeiptr = HTYPE_GLSIZEIPTR---- | Bit field (min. 32 bits)-type GLbitfield = HTYPE_GLBITFIELD---- | Floating-point value (min. 32 bits)-type GLfloat = HTYPE_GLFLOAT---- | Floating-point value clamped to [0,1] (min. 32 bits)-type GLclampf = HTYPE_GLCLAMPF---- | Floating-point value (min. 64 bits)-type GLdouble = HTYPE_GLDOUBLE---- | Floating-point value clamped to [0,1] (min. 64 bits)-type GLclampd = HTYPE_GLCLAMPD------------------------------------------------------------------------------------data Capability =-     Disabled-   | Enabled-   deriving ( Eq, Ord, Show )

@@ -23,21 +23,13 @@    edgeFlag ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum, GLboolean )-import Graphics.Rendering.OpenGL.GL.EdgeFlag (-   EdgeFlag(..), marshalEdgeFlag, unmarshalEdgeFlag )-import Graphics.Rendering.OpenGL.GL.Exception ( bracket_, unsafeBracket_ )-import Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO, Invoker, getProcAddress )-import Graphics.Rendering.OpenGL.GL.PrimitiveMode (-   PrimitiveMode(..), marshalPrimitiveMode )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   getBoolean1, GetPName(GetEdgeFlag) )-import Graphics.Rendering.OpenGL.GL.StateVar ( StateVar, makeStateVar )------------------------------------------------------------------------------------#include "HsOpenGLExt.h"+import Data.StateVar+import Graphics.Rendering.OpenGL.GL.EdgeFlag+import Graphics.Rendering.OpenGL.GL.Exception+import Graphics.Rendering.OpenGL.GL.PrimitiveMode+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility ( glBegin, glEnd, glEdgeFlag )+import Graphics.Rendering.OpenGL.Raw.NV.PrimitiveRestart  -------------------------------------------------------------------------------- @@ -110,16 +102,10 @@ renderPrim brack_ beginMode =    brack_ (glBegin (marshalPrimitiveMode beginMode)) glEnd -foreign import CALLCONV unsafe "glBegin" glBegin :: GLenum -> IO ()--foreign import CALLCONV unsafe "glEnd" glEnd :: IO ()- --------------------------------------------------------------------------------  primitiveRestart :: IO ()-primitiveRestart = glPrimitiveRestartNV--EXTENSION_ENTRY("GL_NV_primitive_restart",glPrimitiveRestartNV,IO ())+primitiveRestart = glPrimitiveRestart  -------------------------------------------------------------------------------- @@ -142,5 +128,3 @@ edgeFlag =    makeStateVar (getBoolean1 unmarshalEdgeFlag GetEdgeFlag)                 (glEdgeFlag . marshalEdgeFlag)--foreign import CALLCONV unsafe "glEdgeFlag" glEdgeFlag :: GLboolean -> IO ()

@@ -16,17 +16,14 @@    bitmap ) where -import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLsizei, GLfloat )-import Graphics.Rendering.OpenGL.GL.CoordTrans ( Size(..), Vector2(..) )-import Graphics.Rendering.OpenGL.GL.VertexSpec ( Vertex2(..) )+import Data.Tensor+import Foreign.Ptr+import Graphics.Rendering.OpenGL.Raw.Core31+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility ( glBitmap )+import Graphics.Rendering.OpenGL.GL.CoordTrans  -------------------------------------------------------------------------------- -bitmap :: Size -> (Vertex2 GLfloat) -> (Vector2 GLfloat) -> Ptr a -> IO ()+bitmap :: Size -> (Vertex2 GLfloat) -> (Vector2 GLfloat) -> Ptr GLubyte -> IO () bitmap (Size w h) (Vertex2 xbo ybo) (Vector2 xbi ybi) =    glBitmap w h xbo ybo xbi ybi--foreign import CALLCONV unsafe "glBitmap"-   glBitmap :: GLsizei -> GLsizei -> GLfloat -> GLfloat -> GLfloat -> GLfloat-            -> Ptr a -> IO ()

@@ -17,7 +17,7 @@    BlendingFactor(..), marshalBlendingFactor, unmarshalBlendingFactor ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -41,37 +41,37 @@  marshalBlendingFactor :: BlendingFactor -> GLenum marshalBlendingFactor x = case x of-   Zero -> 0x0-   One -> 0x1-   SrcColor -> 0x300-   OneMinusSrcColor -> 0x301-   DstColor -> 0x306-   OneMinusDstColor -> 0x307-   SrcAlpha -> 0x302-   OneMinusSrcAlpha -> 0x303-   DstAlpha -> 0x304-   OneMinusDstAlpha -> 0x305-   ConstantColor -> 0x8001-   OneMinusConstantColor -> 0x8002-   ConstantAlpha -> 0x8003-   OneMinusConstantAlpha -> 0x8004-   SrcAlphaSaturate -> 0x308+   Zero -> gl_ZERO+   One -> gl_ONE+   SrcColor -> gl_SRC_COLOR+   OneMinusSrcColor -> gl_ONE_MINUS_SRC_COLOR+   DstColor -> gl_DST_COLOR+   OneMinusDstColor -> gl_ONE_MINUS_DST_COLOR+   SrcAlpha -> gl_SRC_ALPHA+   OneMinusSrcAlpha -> gl_ONE_MINUS_SRC_ALPHA+   DstAlpha -> gl_DST_ALPHA+   OneMinusDstAlpha -> gl_ONE_MINUS_DST_ALPHA+   ConstantColor -> gl_CONSTANT_COLOR+   OneMinusConstantColor -> gl_ONE_MINUS_CONSTANT_COLOR+   ConstantAlpha -> gl_CONSTANT_ALPHA+   OneMinusConstantAlpha -> gl_ONE_MINUS_CONSTANT_ALPHA+   SrcAlphaSaturate -> gl_SRC_ALPHA_SATURATE  unmarshalBlendingFactor :: GLenum -> BlendingFactor unmarshalBlendingFactor x-   | x == 0x0 = Zero-   | x == 0x1 = One-   | x == 0x300 = SrcColor-   | x == 0x301 = OneMinusSrcColor-   | x == 0x306 = DstColor-   | x == 0x307 = OneMinusDstColor-   | x == 0x302 = SrcAlpha-   | x == 0x303 = OneMinusSrcAlpha-   | x == 0x304 = DstAlpha-   | x == 0x305 = OneMinusDstAlpha-   | x == 0x8001 = ConstantColor-   | x == 0x8002 = OneMinusConstantColor-   | x == 0x8003 = ConstantAlpha-   | x == 0x8004 = OneMinusConstantAlpha-   | x == 0x308 = SrcAlphaSaturate+   | x == gl_ZERO = Zero+   | x == gl_ONE = One+   | x == gl_SRC_COLOR = SrcColor+   | x == gl_ONE_MINUS_SRC_COLOR = OneMinusSrcColor+   | x == gl_DST_COLOR = DstColor+   | x == gl_ONE_MINUS_DST_COLOR = OneMinusDstColor+   | x == gl_SRC_ALPHA = SrcAlpha+   | x == gl_ONE_MINUS_SRC_ALPHA = OneMinusSrcAlpha+   | x == gl_DST_ALPHA = DstAlpha+   | x == gl_ONE_MINUS_DST_ALPHA = OneMinusDstAlpha+   | x == gl_CONSTANT_COLOR = ConstantColor+   | x == gl_ONE_MINUS_CONSTANT_COLOR = OneMinusConstantColor+   | x == gl_CONSTANT_ALPHA = ConstantAlpha+   | x == gl_ONE_MINUS_CONSTANT_ALPHA = OneMinusConstantAlpha+   | x == gl_SRC_ALPHA_SATURATE = SrcAlphaSaturate    | otherwise = error ("unmarshalBlendingFactor: illegal value " ++ show x)

@@ -17,7 +17,8 @@    BufferMode(..), marshalBufferMode, unmarshalBufferMode ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum, GLsizei )+import Graphics.Rendering.OpenGL.Raw.Core31+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility ( gl_AUX0 )  -------------------------------------------------------------------------------- @@ -63,31 +64,34 @@  marshalBufferMode :: BufferMode -> Maybe GLenum marshalBufferMode x = case x of-   NoBuffers -> Just 0x0-   FrontLeftBuffer -> Just 0x400-   FrontRightBuffer -> Just 0x401-   BackLeftBuffer -> Just 0x402-   BackRightBuffer -> Just 0x403-   FrontBuffers -> Just 0x404-   BackBuffers -> Just 0x405-   LeftBuffers -> Just 0x406-   RightBuffers -> Just 0x407-   FrontAndBackBuffers -> Just 0x408+   NoBuffers -> Just gl_NONE+   FrontLeftBuffer -> Just gl_FRONT_LEFT+   FrontRightBuffer -> Just gl_FRONT_RIGHT+   BackLeftBuffer -> Just gl_BACK_LEFT+   BackRightBuffer -> Just gl_BACK_RIGHT+   FrontBuffers -> Just gl_FRONT+   BackBuffers -> Just gl_BACK+   LeftBuffers -> Just gl_LEFT+   RightBuffers -> Just gl_RIGHT+   FrontAndBackBuffers -> Just gl_FRONT_AND_BACK    AuxBuffer i-      | i <= 246  -> Just (0x409 + fromIntegral i)+      | fromIntegral i <= maxAuxBuffer -> Just (gl_AUX0 + fromIntegral i)       | otherwise -> Nothing  unmarshalBufferMode :: GLenum -> BufferMode unmarshalBufferMode x-   | x == 0x0 = NoBuffers-   | x == 0x400 = FrontLeftBuffer-   | x == 0x401 = FrontRightBuffer-   | x == 0x402 = BackLeftBuffer-   | x == 0x403 = BackRightBuffer-   | x == 0x404 = FrontBuffers-   | x == 0x405 = BackBuffers-   | x == 0x406 = LeftBuffers-   | x == 0x407 = RightBuffers-   | x == 0x408 = FrontAndBackBuffers-   | 0x409 <= x && x <= 0x4ff = AuxBuffer (fromIntegral x - 0x409)+   | x == gl_NONE = NoBuffers+   | x == gl_FRONT_LEFT = FrontLeftBuffer+   | x == gl_FRONT_RIGHT = FrontRightBuffer+   | x == gl_BACK_LEFT = BackLeftBuffer+   | x == gl_BACK_RIGHT = BackRightBuffer+   | x == gl_FRONT = FrontBuffers+   | x == gl_BACK = BackBuffers+   | x == gl_LEFT = LeftBuffers+   | x == gl_RIGHT = RightBuffers+   | x == gl_FRONT_AND_BACK = FrontAndBackBuffers+   | gl_AUX0 <= x && x <= gl_AUX0 + maxAuxBuffer = AuxBuffer (fromIntegral (x - gl_AUX0))    | otherwise = error ("unmarshalBufferMode: illegal value " ++ show x)++maxAuxBuffer :: GLenum+maxAuxBuffer = 246

@@ -15,7 +15,7 @@  module Graphics.Rendering.OpenGL.GL.BufferObjects (    -- * Object Names-   ObjectName(..),+   module Data.ObjectName,     -- * Buffer Objects    BufferObject(BufferObject),@@ -33,47 +33,20 @@    bufferAccess, bufferMapped ) where -import Foreign.Marshal.Alloc ( alloca )-import Foreign.Marshal.Array ( withArrayLen, peekArray, allocaArray )-import Foreign.Ptr ( Ptr )-import Foreign.Storable ( Storable(peek) )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLboolean, GLenum, GLint, GLintptr, GLuint, GLsizei, GLsizeiptr )-import Graphics.Rendering.OpenGL.GL.Exception ( finallyRet )-import Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO, Invoker, getProcAddress )-import Graphics.Rendering.OpenGL.GL.GLboolean ( unmarshalGLboolean )-import Graphics.Rendering.OpenGL.GL.PeekPoke ( peek1 )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetArrayBufferBinding,GetElementArrayBufferBinding,-            GetVertexArrayBufferBinding,GetNormalArrayBufferBinding,-            GetColorArrayBufferBinding,GetIndexArrayBufferBinding,-            GetTextureCoordArrayBufferBinding,GetEdgeFlagArrayBufferBinding,-            GetFogCoordArrayBufferBinding,GetSecondaryColorArrayBufferBinding,-            GetPixelPackBufferBinding,GetPixelUnpackBufferBinding,-            GetCopyReadBuffer,GetCopyWriteBuffer),-   getInteger1, maybeNullPtr,-   GetVertexAttribPName(GetVertexAttribArrayBufferBinding), getVertexAttribInteger1 )-import Graphics.Rendering.OpenGL.GL.StateVar (-   GettableStateVar, makeGettableStateVar, StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GL.VertexArrays ( ClientArrayType(..) )-import Graphics.Rendering.OpenGL.GL.VertexSpec ( AttribLocation )-import Graphics.Rendering.OpenGL.GLU.ErrorsInternal ( recordInvalidEnum )------------------------------------------------------------------------------------#include "HsOpenGLExt.h"-------------------------------------------------------------------------------------- | An 'ObjectName' corresponds to the general OpenGL notion of an explicitly--- handled object name, e.g. a display list name, a texture object name, a--- buffer object name, etc.--class ObjectName a where-   genObjectNames :: Int -> IO [a]-   deleteObjectNames:: [a] -> IO ()-   isObjectName :: a -> IO Bool+import Data.ObjectName+import Data.StateVar+import Foreign.Marshal.Alloc+import Foreign.Marshal.Array+import Foreign.Ptr+import Foreign.Storable+import Graphics.Rendering.OpenGL.GL.Exception+import Graphics.Rendering.OpenGL.GL.GLboolean+import Graphics.Rendering.OpenGL.GL.PeekPoke+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.VertexArrays+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.GLU.ErrorsInternal+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -85,20 +58,14 @@ instance ObjectName BufferObject where    genObjectNames n =       allocaArray n $ \buf -> do-        glGenBuffersARB (fromIntegral n) buf+        glGenBuffers (fromIntegral n) buf         fmap (map BufferObject) $ peekArray n buf     deleteObjectNames bufferObjects =       withArrayLen (map bufferID bufferObjects) $-         glDeleteBuffersARB . fromIntegral--   isObjectName = fmap unmarshalGLboolean . glIsBufferARB . bufferID--EXTENSION_ENTRY("GL_ARB_vertex_buffer_object or OpenGL 1.5",glGenBuffersARB,GLsizei -> Ptr GLuint -> IO ())--EXTENSION_ENTRY("GL_ARB_vertex_buffer_object or OpenGL 1.5",glDeleteBuffersARB,GLsizei -> Ptr GLuint -> IO ())+         glDeleteBuffers . fromIntegral -EXTENSION_ENTRY("GL_ARB_vertex_buffer_object or OpenGL 1.5",glIsBufferARB,GLuint -> IO GLboolean)+   isObjectName = fmap unmarshalGLboolean . glIsBuffer . bufferID  -------------------------------------------------------------------------------- @@ -113,12 +80,12 @@  marshalBufferTarget :: BufferTarget -> GLenum marshalBufferTarget x = case x of-   ArrayBuffer -> 0x8892-   CopyReadBuffer -> 0x8F36-   CopyWriteBuffer -> 0x8F37-   ElementArrayBuffer -> 0x8893-   PixelPackBuffer -> 0x88eb-   PixelUnpackBuffer -> 0x88ec+   ArrayBuffer -> gl_ARRAY_BUFFER+   CopyReadBuffer -> gl_COPY_READ_BUFFER+   CopyWriteBuffer -> gl_COPY_WRITE_BUFFER+   ElementArrayBuffer -> gl_ELEMENT_ARRAY_BUFFER+   PixelPackBuffer -> gl_PIXEL_PACK_BUFFER+   PixelUnpackBuffer -> gl_PIXEL_UNPACK_BUFFER  bufferTargetToGetPName :: BufferTarget -> GetPName bufferTargetToGetPName x = case x of@@ -145,27 +112,27 @@  marshalBufferUsage :: BufferUsage -> GLenum marshalBufferUsage x = case x of-   StreamDraw -> 0x88e0-   StreamRead -> 0x88e1-   StreamCopy -> 0x88e2-   StaticDraw -> 0x88e4-   StaticRead -> 0x88e5-   StaticCopy -> 0x88e6-   DynamicDraw -> 0x88e8-   DynamicRead -> 0x88e9-   DynamicCopy -> 0x88ea+   StreamDraw -> gl_STREAM_DRAW+   StreamRead -> gl_STREAM_READ+   StreamCopy -> gl_STREAM_COPY+   StaticDraw -> gl_STATIC_DRAW+   StaticRead -> gl_STATIC_READ+   StaticCopy -> gl_STATIC_COPY+   DynamicDraw -> gl_DYNAMIC_DRAW+   DynamicRead -> gl_DYNAMIC_READ+   DynamicCopy -> gl_DYNAMIC_COPY  unmarshalBufferUsage :: GLenum -> BufferUsage unmarshalBufferUsage x-   | x == 0x88e0 = StreamDraw-   | x == 0x88e1 = StreamRead-   | x == 0x88e2 = StreamCopy-   | x == 0x88e4 = StaticDraw-   | x == 0x88e5 = StaticRead-   | x == 0x88e6 = StaticCopy-   | x == 0x88e8 = DynamicDraw-   | x == 0x88e9 = DynamicRead-   | x == 0x88ea = DynamicCopy+   | x == gl_STREAM_DRAW = StreamDraw+   | x == gl_STREAM_READ = StreamRead+   | x == gl_STREAM_COPY = StreamCopy+   | x == gl_STATIC_DRAW = StaticDraw+   | x == gl_STATIC_READ = StaticRead+   | x == gl_STATIC_COPY = StaticCopy+   | x == gl_DYNAMIC_DRAW = DynamicDraw+   | x == gl_DYNAMIC_READ = DynamicRead+   | x == gl_DYNAMIC_COPY = DynamicCopy    | otherwise = error ("unmarshalBufferUsage: illegal value " ++ show x)  --------------------------------------------------------------------------------@@ -178,15 +145,15 @@  marshalBufferAccess :: BufferAccess -> GLenum marshalBufferAccess x = case x of-   ReadOnly -> 0x88b8-   WriteOnly -> 0x88b9-   ReadWrite -> 0x88ba+   ReadOnly -> gl_READ_ONLY+   WriteOnly -> gl_WRITE_ONLY+   ReadWrite -> gl_READ_WRITE  unmarshalBufferAccess :: GLenum -> BufferAccess unmarshalBufferAccess x-   | x == 0x88b8 = ReadOnly-   | x == 0x88b9 = WriteOnly-   | x == 0x88ba = ReadWrite+   | x == gl_READ_ONLY = ReadOnly+   | x == gl_WRITE_ONLY = WriteOnly+   | x == gl_READ_WRITE = ReadWrite    | otherwise = error ("unmarshalBufferAccess: illegal value " ++ show x)  --------------------------------------------------------------------------------@@ -207,9 +174,7 @@  setBindBuffer :: BufferTarget -> Maybe BufferObject -> IO () setBindBuffer t =-   glBindBufferARB (marshalBufferTarget t) . bufferID . maybe noBufferObject id--EXTENSION_ENTRY("GL_ARB_vertex_buffer_object or OpenGL 1.5",glBindBufferARB,GLenum -> GLuint -> IO ())+   glBindBuffer (marshalBufferTarget t) . bufferID . maybe noBufferObject id  clientArrayTypeToGetPName :: ClientArrayType -> GetPName clientArrayTypeToGetPName x = case x of@@ -250,9 +215,7 @@  setBufferData :: BufferTarget -> (GLsizeiptr, Ptr a, BufferUsage) -> IO () setBufferData t (s, p, u) =-   glBufferDataARB (marshalBufferTarget t) s p (marshalBufferUsage u)--EXTENSION_ENTRY("GL_ARB_vertex_buffer_object or OpenGL 1.5",glBufferDataARB,GLenum -> GLsizeiptr -> Ptr a -> GLenum -> IO ())+   glBufferData (marshalBufferTarget t) s p (marshalBufferUsage u)  -------------------------------------------------------------------------------- @@ -263,12 +226,8 @@  bufferSubData ::    BufferTarget -> TransferDirection -> GLintptr -> GLsizeiptr -> Ptr a -> IO ()-bufferSubData t WriteToBuffer = glBufferSubDataARB (marshalBufferTarget t)-bufferSubData t ReadFromBuffer = glGetBufferSubDataARB (marshalBufferTarget t)--EXTENSION_ENTRY("GL_ARB_vertex_buffer_object or OpenGL 1.5",glBufferSubDataARB,GLenum -> GLintptr -> GLsizeiptr -> Ptr a -> IO ())--EXTENSION_ENTRY("GL_ARB_vertex_buffer_object or OpenGL 1.5",glGetBufferSubDataARB,GLenum -> GLintptr -> GLsizeiptr -> Ptr a -> IO ())+bufferSubData t WriteToBuffer = glBufferSubData (marshalBufferTarget t)+bufferSubData t ReadFromBuffer = glGetBufferSubData (marshalBufferTarget t)  -------------------------------------------------------------------------------- @@ -280,29 +239,24 @@  marshalGetBufferPName :: GetBufferPName -> GLenum marshalGetBufferPName x = case x of-   GetBufferSize -> 0x8764-   GetBufferUsage -> 0x8765-   GetBufferAccess -> 0x88bb-   GetBufferMapped -> 0x88bc+   GetBufferSize -> gl_BUFFER_SIZE+   GetBufferUsage -> gl_BUFFER_USAGE+   GetBufferAccess -> gl_BUFFER_ACCESS+   GetBufferMapped -> gl_BUFFER_MAPPED  getBufferParameter :: BufferTarget -> (GLenum -> a) -> GetBufferPName -> IO a getBufferParameter t f p = alloca $ \buf -> do-   glGetBufferParameterivARB (marshalBufferTarget t)-                             (marshalGetBufferPName p) buf+   glGetBufferParameteriv (marshalBufferTarget t)+                          (marshalGetBufferPName p) buf    peek1 (f . fromIntegral) buf -EXTENSION_ENTRY("GL_ARB_vertex_buffer_object or OpenGL 1.5",glGetBufferParameterivARB,GLenum -> GLenum -> Ptr GLint -> IO ())- --------------------------------------------------------------------------------  getBufferPointer :: BufferTarget -> IO (Ptr a) getBufferPointer t = alloca $ \buf -> do-   -- only one pname: GL_BUFFER_MAP_POINTER-   glGetBufferPointervARB (marshalBufferTarget t) 0x88bd buf+   glGetBufferPointerv (marshalBufferTarget t) gl_BUFFER_MAP_POINTER buf    peek buf -EXTENSION_ENTRY("GL_ARB_vertex_buffer_object or OpenGL 1.5",glGetBufferPointervARB,GLenum -> GLenum -> Ptr (Ptr a) -> IO ())- --------------------------------------------------------------------------------  data MappingFailure =@@ -326,14 +280,10 @@ mapBuffer t = fmap (maybeNullPtr Nothing Just) . mapBuffer_ t  mapBuffer_ :: BufferTarget -> BufferAccess -> IO (Ptr a)-mapBuffer_ t = glMapBufferARB (marshalBufferTarget t) . marshalBufferAccess--EXTENSION_ENTRY("GL_ARB_vertex_buffer_object or OpenGL 1.5",glMapBufferARB,GLenum -> GLenum -> IO (Ptr a))+mapBuffer_ t = glMapBuffer (marshalBufferTarget t) . marshalBufferAccess  unmapBuffer :: BufferTarget -> IO Bool-unmapBuffer = fmap unmarshalGLboolean . glUnmapBufferARB . marshalBufferTarget--EXTENSION_ENTRY("GL_ARB_vertex_buffer_object or OpenGL 1.5",glUnmapBufferARB,GLenum -> IO GLboolean)+unmapBuffer = fmap unmarshalGLboolean . glUnmapBuffer . marshalBufferTarget  bufferAccess :: BufferTarget -> GettableStateVar BufferAccess bufferAccess t = makeGettableStateVar $

@@ -15,22 +15,47 @@ --------------------------------------------------------------------------------  module Graphics.Rendering.OpenGL.GL.Capability (-   marshalCapability, unmarshalCapability,+   Capability(..), marshalCapability, unmarshalCapability,    EnableCap(..), makeCapability, makeStateVarMaybe ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLboolean, GLenum, GLsizei, Capability(..) )-import Graphics.Rendering.OpenGL.GL.GLboolean (-   marshalGLboolean, unmarshalGLboolean )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   clipPlaneIndexToEnum, lightIndexToEnum )-import Graphics.Rendering.OpenGL.GL.StateVar (-   HasGetter(get), HasSetter(($=)), StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GLU.ErrorsInternal ( recordInvalidEnum )+import Data.StateVar+import Graphics.Rendering.OpenGL.GL.GLboolean+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GLU.ErrorsInternal+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   gl_ALPHA_TEST, gl_AUTO_NORMAL, gl_COLOR_ARRAY, gl_COLOR_MATERIAL,+   gl_COLOR_SUM, gl_COLOR_TABLE, gl_CONVOLUTION_1D, gl_CONVOLUTION_2D,+   gl_EDGE_FLAG_ARRAY, gl_FOG, gl_FOG_COORD_ARRAY, gl_HISTOGRAM, gl_INDEX_ARRAY,+   gl_INDEX_LOGIC_OP, gl_LIGHTING, gl_LINE_STIPPLE, gl_MAP1_COLOR_4,+   gl_MAP1_INDEX, gl_MAP1_NORMAL, gl_MAP1_TEXTURE_COORD_1,+   gl_MAP1_TEXTURE_COORD_2, gl_MAP1_TEXTURE_COORD_3, gl_MAP1_TEXTURE_COORD_4,+   gl_MAP1_VERTEX_3, gl_MAP1_VERTEX_4, gl_MAP2_COLOR_4, gl_MAP2_INDEX,+   gl_MAP2_NORMAL, gl_MAP2_TEXTURE_COORD_1, gl_MAP2_TEXTURE_COORD_2,+   gl_MAP2_TEXTURE_COORD_3, gl_MAP2_TEXTURE_COORD_4, gl_MAP2_VERTEX_3,+   gl_MAP2_VERTEX_4, gl_MINMAX, gl_NORMALIZE, gl_NORMAL_ARRAY, gl_POINT_SMOOTH,+   gl_POINT_SPRITE, gl_POLYGON_STIPPLE, gl_POST_COLOR_MATRIX_COLOR_TABLE,+   gl_POST_CONVOLUTION_COLOR_TABLE, gl_RESCALE_NORMAL, gl_SECONDARY_COLOR_ARRAY,+   gl_SEPARABLE_2D, gl_TEXTURE_COORD_ARRAY, gl_TEXTURE_GEN_Q, gl_TEXTURE_GEN_R,+   gl_TEXTURE_GEN_S, gl_TEXTURE_GEN_T, gl_VERTEX_ARRAY,+   gl_VERTEX_PROGRAM_TWO_SIDE )+import Graphics.Rendering.OpenGL.Raw.ARB.MatrixPalette ( gl_MATRIX_INDEX_ARRAY, gl_MATRIX_PALETTE )+import Graphics.Rendering.OpenGL.Raw.ARB.VertexBlend ( gl_WEIGHT_SUM_UNITY, gl_VERTEX_BLEND, gl_WEIGHT_ARRAY )+import Graphics.Rendering.OpenGL.Raw.Core31+import Graphics.Rendering.OpenGL.Raw.EXT.DepthBoundsTest ( gl_DEPTH_BOUNDS_TEST )+import Graphics.Rendering.OpenGL.Raw.EXT.SharedTexturePalette ( gl_SHARED_TEXTURE_PALETTE )+import Graphics.Rendering.OpenGL.Raw.EXT.StencilTwoSide ( gl_STENCIL_TEST_TWO_SIDE )+import Graphics.Rendering.OpenGL.Raw.NV.DepthClamp ( gl_DEPTH_CLAMP )  -------------------------------------------------------------------------------- +data Capability =+     Disabled+   | Enabled+   deriving ( Eq, Ord, Show )++--------------------------------------------------------------------------------+ marshalCapability :: Capability -> GLboolean marshalCapability = marshalGLboolean . (Enabled ==) @@ -121,7 +146,7 @@    | CapMatrixPalette    | CapDepthClamp    | CapDepthBoundsTest-   | CapPrimitiveRestart -- NOTE: client state!+   | CapPrimitiveRestart    | CapPointSprite    | CapStencilTestTwoSide    | CapRasterPositionUnclipped@@ -131,94 +156,96 @@  marshalEnableCap :: EnableCap -> Maybe GLenum marshalEnableCap x = case x of-   CapFog -> Just 0xb60-   CapLighting -> Just 0xb50-   CapTexture1D -> Just 0xde0-   CapTexture2D -> Just 0xde1-   CapTextureRectangle -> Just 0x84F5-   CapLineStipple -> Just 0xb24-   CapPolygonStipple -> Just 0xb42-   CapCullFace -> Just 0xb44-   CapAlphaTest -> Just 0xbc0-   CapBlend -> Just 0xbe2-   CapIndexLogicOp -> Just 0xbf1-   CapColorLogicOp -> Just 0xbf2-   CapDither -> Just 0xbd0-   CapStencilTest -> Just 0xb90-   CapDepthTest -> Just 0xb71+   CapFog -> Just gl_FOG+   CapLighting -> Just gl_LIGHTING+   CapTexture1D -> Just gl_TEXTURE_1D+   CapTexture2D -> Just gl_TEXTURE_2D+   CapTextureRectangle -> Just gl_TEXTURE_RECTANGLE+   CapLineStipple -> Just gl_LINE_STIPPLE+   CapPolygonStipple -> Just gl_POLYGON_STIPPLE+   CapCullFace -> Just gl_CULL_FACE+   CapAlphaTest -> Just gl_ALPHA_TEST+   CapBlend -> Just gl_BLEND+   CapIndexLogicOp -> Just gl_INDEX_LOGIC_OP+   CapColorLogicOp -> Just gl_COLOR_LOGIC_OP+   CapDither -> Just gl_DITHER+   CapStencilTest -> Just gl_STENCIL_TEST+   CapDepthTest -> Just gl_DEPTH_TEST    CapClipPlane i -> clipPlaneIndexToEnum i    CapLight i -> lightIndexToEnum i-   CapTextureGenS -> Just 0xc60-   CapTextureGenT -> Just 0xc61-   CapTextureGenR -> Just 0xc62-   CapTextureGenQ -> Just 0xc63-   CapMap1Vertex3 -> Just 0xd97-   CapMap1Vertex4 -> Just 0xd98-   CapMap1Color4 -> Just 0xd90-   CapMap1Index -> Just 0xd91-   CapMap1Normal -> Just 0xd92-   CapMap1TextureCoord1 -> Just 0xd93-   CapMap1TextureCoord2 -> Just 0xd94-   CapMap1TextureCoord3 -> Just 0xd95-   CapMap1TextureCoord4 -> Just 0xd96-   CapMap2Vertex3 -> Just 0xdb7-   CapMap2Vertex4 -> Just 0xdb8-   CapMap2Color4 -> Just 0xdb0-   CapMap2Index -> Just 0xdb1-   CapMap2Normal -> Just 0xdb2-   CapMap2TextureCoord1 -> Just 0xdb3-   CapMap2TextureCoord2 -> Just 0xdb4-   CapMap2TextureCoord3 -> Just 0xdb5-   CapMap2TextureCoord4 -> Just 0xdb6-   CapPointSmooth -> Just 0xb10-   CapLineSmooth -> Just 0xb20-   CapPolygonSmooth -> Just 0xb41-   CapScissorTest -> Just 0xc11-   CapColorMaterial -> Just 0xb57-   CapNormalize -> Just 0xba1-   CapAutoNormal -> Just 0xd80-   CapPolygonOffsetPoint -> Just 0x2a01-   CapPolygonOffsetLine -> Just 0x2a02-   CapPolygonOffsetFill -> Just 0x8037-   CapVertexArray -> Just 0x8074-   CapNormalArray -> Just 0x8075-   CapColorArray -> Just 0x8076-   CapIndexArray -> Just 0x8077-   CapTextureCoordArray -> Just 0x8078-   CapEdgeFlagArray -> Just 0x8079-   CapFogCoordArray -> Just 0x8457-   CapSecondaryColorArray -> Just 0x845e-   CapMatrixIndexArray -> Just 0x8844-   CapConvolution1D -> Just 0x8010-   CapConvolution2D -> Just 0x8011-   CapSeparable2D -> Just 0x8012-   CapHistogram -> Just 0x8024-   CapMinmax -> Just 0x802e-   CapRescaleNormal -> Just 0x803a-   CapSharedTexturePalette -> Just 0x81fb-   CapTexture3D -> Just 0x806f-   CapMultisample -> Just 0x809d-   CapSampleAlphaToCoverage -> Just 0x809e-   CapSampleAlphaToOne -> Just 0x809f-   CapSampleCoverage -> Just 0x80a0-   CapColorTable -> Just 0x80d0-   CapPostConvolutionColorTable -> Just 0x80d1-   CapPostColorMatrixColorTable -> Just 0x80d2-   CapColorSum -> Just 0x8458-   CapTextureCubeMap -> Just 0x8513-   CapWeightSumUnity -> Just 0x86a6-   CapVertexBlend -> Just 0x86a7-   CapWeightArray -> Just 0x86ad-   CapMatrixPalette -> Just 0x8840-   CapDepthClamp -> Just 0x864f-   CapDepthBoundsTest -> Just 0x8890-   CapPrimitiveRestart -> Just 0x8558-   CapPointSprite -> Just 0x8861-   CapStencilTestTwoSide -> Just 0x8910+   CapTextureGenS -> Just gl_TEXTURE_GEN_S+   CapTextureGenT -> Just gl_TEXTURE_GEN_T+   CapTextureGenR -> Just gl_TEXTURE_GEN_R+   CapTextureGenQ -> Just gl_TEXTURE_GEN_Q+   CapMap1Vertex3 -> Just gl_MAP1_VERTEX_3+   CapMap1Vertex4 -> Just gl_MAP1_VERTEX_4+   CapMap1Color4 -> Just gl_MAP1_COLOR_4+   CapMap1Index -> Just gl_MAP1_INDEX+   CapMap1Normal -> Just gl_MAP1_NORMAL+   CapMap1TextureCoord1 -> Just gl_MAP1_TEXTURE_COORD_1+   CapMap1TextureCoord2 -> Just gl_MAP1_TEXTURE_COORD_2+   CapMap1TextureCoord3 -> Just gl_MAP1_TEXTURE_COORD_3+   CapMap1TextureCoord4 -> Just gl_MAP1_TEXTURE_COORD_4+   CapMap2Vertex3 -> Just gl_MAP2_VERTEX_3+   CapMap2Vertex4 -> Just gl_MAP2_VERTEX_4+   CapMap2Color4 -> Just gl_MAP2_COLOR_4+   CapMap2Index -> Just gl_MAP2_INDEX+   CapMap2Normal -> Just gl_MAP2_NORMAL+   CapMap2TextureCoord1 -> Just gl_MAP2_TEXTURE_COORD_1+   CapMap2TextureCoord2 -> Just gl_MAP2_TEXTURE_COORD_2+   CapMap2TextureCoord3 -> Just gl_MAP2_TEXTURE_COORD_3+   CapMap2TextureCoord4 -> Just gl_MAP2_TEXTURE_COORD_4+   CapPointSmooth -> Just gl_POINT_SMOOTH+   CapLineSmooth -> Just gl_LINE_SMOOTH+   CapPolygonSmooth -> Just gl_POLYGON_SMOOTH+   CapScissorTest -> Just gl_SCISSOR_TEST+   CapColorMaterial -> Just gl_COLOR_MATERIAL+   CapNormalize -> Just gl_NORMALIZE+   CapAutoNormal -> Just gl_AUTO_NORMAL+   CapPolygonOffsetPoint -> Just gl_POLYGON_OFFSET_POINT+   CapPolygonOffsetLine -> Just gl_POLYGON_OFFSET_LINE+   CapPolygonOffsetFill -> Just gl_POLYGON_OFFSET_FILL+   CapVertexArray -> Just gl_VERTEX_ARRAY+   CapNormalArray -> Just gl_NORMAL_ARRAY+   CapColorArray -> Just gl_COLOR_ARRAY+   CapIndexArray -> Just gl_INDEX_ARRAY+   CapTextureCoordArray -> Just gl_TEXTURE_COORD_ARRAY+   CapEdgeFlagArray -> Just gl_EDGE_FLAG_ARRAY+   CapFogCoordArray -> Just gl_FOG_COORD_ARRAY+   CapSecondaryColorArray -> Just gl_SECONDARY_COLOR_ARRAY+   CapMatrixIndexArray -> Just gl_MATRIX_INDEX_ARRAY+   CapConvolution1D -> Just gl_CONVOLUTION_1D+   CapConvolution2D -> Just gl_CONVOLUTION_2D+   CapSeparable2D -> Just gl_SEPARABLE_2D+   CapHistogram -> Just gl_HISTOGRAM+   CapMinmax -> Just gl_MINMAX+   CapRescaleNormal -> Just gl_RESCALE_NORMAL+   CapSharedTexturePalette -> Just gl_SHARED_TEXTURE_PALETTE+   CapTexture3D -> Just gl_TEXTURE_3D+   CapMultisample -> Just gl_MULTISAMPLE+   CapSampleAlphaToCoverage -> Just gl_SAMPLE_ALPHA_TO_COVERAGE+   CapSampleAlphaToOne -> Just gl_SAMPLE_ALPHA_TO_ONE+   CapSampleCoverage -> Just gl_SAMPLE_COVERAGE+   CapColorTable -> Just gl_COLOR_TABLE+   CapPostConvolutionColorTable -> Just gl_POST_CONVOLUTION_COLOR_TABLE+   CapPostColorMatrixColorTable -> Just gl_POST_COLOR_MATRIX_COLOR_TABLE+   CapColorSum -> Just gl_COLOR_SUM+   CapTextureCubeMap -> Just gl_TEXTURE_CUBE_MAP+   CapWeightSumUnity -> Just gl_WEIGHT_SUM_UNITY+   CapVertexBlend -> Just gl_VERTEX_BLEND+   CapWeightArray -> Just gl_WEIGHT_ARRAY+   CapMatrixPalette -> Just gl_MATRIX_PALETTE+   CapDepthClamp -> Just gl_DEPTH_CLAMP+   CapDepthBoundsTest -> Just gl_DEPTH_BOUNDS_TEST+   CapPrimitiveRestart -> Just gl_PRIMITIVE_RESTART+   CapPointSprite -> Just gl_POINT_SPRITE+   CapStencilTestTwoSide -> Just gl_STENCIL_TEST_TWO_SIDE+   -- TODO: use RASTER_POSITION_UNCLIPPED_IBM from IBM_rasterpos_clip extension    CapRasterPositionUnclipped -> Just 0x19262+   -- TODO: use TEXTURE_COLOR_TABLE_SGI from SGI_texture_color_table extension    CapTextureColorTable -> Just 0x80bc-   CapVertexProgramPointSize -> Just 0x8642-   CapVertexProgramTwoSide -> Just 0x8643+   CapVertexProgramPointSize -> Just gl_VERTEX_PROGRAM_POINT_SIZE+   CapVertexProgramTwoSide -> Just gl_VERTEX_PROGRAM_TWO_SIDE  -------------------------------------------------------------------------------- @@ -233,19 +260,12 @@          (fmap unmarshalCapability . glIsEnabled) .    marshalEnableCap -foreign import CALLCONV unsafe "glIsEnabled" glIsEnabled ::-   GLenum -> IO GLboolean- --------------------------------------------------------------------------------  enable :: EnableCap -> Capability -> IO () enable cap state = maybe recordInvalidEnum (f state) (marshalEnableCap cap)    where f Disabled = glDisable          f Enabled  = glEnable--foreign import CALLCONV unsafe "glDisable" glDisable :: GLenum -> IO ()--foreign import CALLCONV unsafe "glEnable" glEnable :: GLenum -> IO ()  -------------------------------------------------------------------------------- 

@@ -16,20 +16,17 @@    ClipPlaneName(..), clipPlane, maxClipPlanes ) where -import Foreign.Marshal.Alloc ( alloca )-import Foreign.Marshal.Utils ( with )-import Foreign.Ptr ( Ptr, castPtr )-import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum, GLsizei, GLdouble )-import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapClipPlane), makeStateVarMaybe )-import Graphics.Rendering.OpenGL.GL.CoordTrans ( Plane(..) )-import Graphics.Rendering.OpenGL.GL.PeekPoke ( peek1 )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetClipPlane,GetMaxClipPlanes),-   clipPlaneIndexToEnum, getDoublev, getSizei1 )-import Graphics.Rendering.OpenGL.GL.StateVar (-   GettableStateVar, makeGettableStateVar, StateVar )-import Graphics.Rendering.OpenGL.GLU.ErrorsInternal ( recordInvalidEnum )+import Data.StateVar+import Foreign.Marshal.Alloc+import Foreign.Marshal.Utils+import Foreign.Ptr+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.CoordTrans+import Graphics.Rendering.OpenGL.GL.PeekPoke+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GLU.ErrorsInternal+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility ( glClipPlane )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -45,11 +42,11 @@       (alloca $ \buf -> do           getDoublev (GetClipPlane i) (castPtr buf)           peek1 id (buf :: Ptr (Plane GLdouble)))-      (\plane -> maybe recordInvalidEnum (with plane . glClipPlane)+      (\plane -> maybe recordInvalidEnum (with plane . glClipPlane_)                        (clipPlaneIndexToEnum i)) -foreign import CALLCONV unsafe "glClipPlane" glClipPlane ::-   GLenum -> Ptr (Plane GLdouble) -> IO ()+glClipPlane_ :: GLenum -> Ptr (Plane GLdouble) -> IO ()+glClipPlane_ plane ptr = glClipPlane plane (castPtr ptr)  -------------------------------------------------------------------------------- 

@@ -16,10 +16,8 @@    colorSum ) where -import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapColorSum), makeCapability )-import Graphics.Rendering.OpenGL.GL.BasicTypes ( Capability )-import Graphics.Rendering.OpenGL.GL.StateVar ( StateVar )+import Data.StateVar+import Graphics.Rendering.OpenGL.GL.Capability  -------------------------------------------------------------------------------- 

@@ -39,35 +39,31 @@    ShadingModel(..), shadeModel ) where -import Control.Monad ( liftM2, liftM3 )-import Foreign.Marshal.Alloc ( alloca )-import Foreign.Marshal.Array ( allocaArray, withArray )-import Foreign.Marshal.Utils ( with )-import Foreign.Ptr ( Ptr )-import Foreign.Storable ( Storable(peek) )-import Graphics.Rendering.OpenGL.GL.Capability (-   marshalCapability, unmarshalCapability,-   EnableCap(CapVertexProgramTwoSide,CapLighting,CapColorMaterial,CapLight),-   makeCapability,-   makeStateVarMaybe )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLenum, GLint, GLsizei, GLfloat,Capability )-import Graphics.Rendering.OpenGL.GL.Face (-   Face(..), marshalFace, unmarshalFace )-import Graphics.Rendering.OpenGL.GL.PeekPoke ( peek3 )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetMaxLights, GetFrontFace,GetShadeModel,-            GetLightModelAmbient, GetLightModelLocalViewer,-            GetLightModelTwoSide, GetLightModelColorControl,-            GetColorMaterialFace,GetColorMaterialParameter,-            GetMaxShininess,GetMaxSpotExponent),-   getBoolean1, getEnum1, getSizei1, getFloat1, getFloat4, lightIndexToEnum )-import Graphics.Rendering.OpenGL.GL.StateVar (-   HasGetter(get), HasSetter(($=)),-   GettableStateVar, makeGettableStateVar, StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GL.VertexSpec (-   Color4(..), Normal3(..), Vertex4(..), Index1(..) )-import Graphics.Rendering.OpenGL.GLU.ErrorsInternal ( recordInvalidEnum )+import Control.Monad+import Data.StateVar+import Data.Tensor+import Foreign.Marshal.Alloc+import Foreign.Marshal.Array+import Foreign.Marshal.Utils+import Foreign.Ptr+import Foreign.Storable+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.Face+import Graphics.Rendering.OpenGL.GL.PeekPoke+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.GLU.ErrorsInternal+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glColorMaterial, glGetLightfv, glGetMaterialfv, glGetMaterialiv,+   glLightModelfv, glLightModeli, glLightfv, glMaterialfv, glMaterialiv,+   glShadeModel, gl_AMBIENT, gl_AMBIENT_AND_DIFFUSE, gl_COLOR_INDEXES,+   gl_CONSTANT_ATTENUATION, gl_DIFFUSE, gl_EMISSION, gl_FLAT,+   gl_LIGHT_MODEL_AMBIENT, gl_LIGHT_MODEL_COLOR_CONTROL,+   gl_LIGHT_MODEL_LOCAL_VIEWER, gl_LIGHT_MODEL_TWO_SIDE, gl_LINEAR_ATTENUATION,+   gl_POSITION, gl_QUADRATIC_ATTENUATION, gl_SEPARATE_SPECULAR_COLOR,+   gl_SHININESS, gl_SINGLE_COLOR, gl_SMOOTH, gl_SPECULAR, gl_SPOT_CUTOFF,+   gl_SPOT_DIRECTION, gl_SPOT_EXPONENT )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -99,13 +95,13 @@  marshalFrontFaceDirection :: FrontFaceDirection -> GLenum marshalFrontFaceDirection x = case x of-   CW -> 0x900-   CCW -> 0x901+   CW -> gl_CW+   CCW -> gl_CCW  unmarshalFrontFaceDirection :: GLenum -> FrontFaceDirection unmarshalFrontFaceDirection x-   | x == 0x900 = CW-   | x == 0x901 = CCW+   | x == gl_CW = CW+   | x == gl_CCW = CCW    | otherwise = error ("unmarshalFrontFaceDirection: illegal value " ++ show x)  --------------------------------------------------------------------------------@@ -116,8 +112,6 @@       (getEnum1 unmarshalFrontFaceDirection GetFrontFace)       (glFrontFace . marshalFrontFaceDirection) -foreign import CALLCONV unsafe "glFrontFace" glFrontFace :: GLenum -> IO ()- --------------------------------------------------------------------------------  data MaterialParameter =@@ -131,13 +125,13 @@  marshalMaterialParameter :: MaterialParameter -> GLenum marshalMaterialParameter x = case x of-   MaterialEmission -> 0x1600-   MaterialShininess -> 0x1601-   MaterialAmbientAndDiffuse -> 0x1602-   MaterialColorIndexes -> 0x1603-   MaterialAmbient -> 0x1200-   MaterialDiffuse -> 0x1201-   MaterialSpecular -> 0x1202+   MaterialEmission -> gl_EMISSION+   MaterialShininess -> gl_SHININESS+   MaterialAmbientAndDiffuse -> gl_AMBIENT_AND_DIFFUSE+   MaterialColorIndexes -> gl_COLOR_INDEXES+   MaterialAmbient -> gl_AMBIENT+   MaterialDiffuse -> gl_DIFFUSE+   MaterialSpecular -> gl_SPECULAR  -------------------------------------------------------------------------------- @@ -171,11 +165,11 @@    where mp = marshalMaterialParameter materialParameter          f  = marshalFace face -foreign import CALLCONV unsafe "glGetMaterialfv" glGetMaterialfvc ::-   GLenum -> GLenum -> Ptr (Color4 GLfloat) -> IO ()+glGetMaterialfvc :: GLenum -> GLenum -> Ptr (Color4 GLfloat) -> IO ()+glGetMaterialfvc face pname ptr = glGetMaterialfv face pname (castPtr ptr) -foreign import CALLCONV unsafe "glMaterialfv" glMaterialfvc ::-   GLenum -> GLenum -> Ptr (Color4 GLfloat) -> IO ()+glMaterialfvc :: GLenum -> GLenum -> Ptr (Color4 GLfloat) -> IO ()+glMaterialfvc face pname ptr = glMaterialfv face pname (castPtr ptr)  -------------------------------------------------------------------------------- @@ -183,11 +177,11 @@ materialShininess =    makeMaterialVar glGetMaterialfvf glMaterialff MaterialShininess -foreign import CALLCONV unsafe "glGetMaterialfv" glGetMaterialfvf ::-   GLenum -> GLenum -> Ptr GLfloat -> IO ()+glGetMaterialfvf :: GLenum -> GLenum -> Ptr GLfloat -> IO ()+glGetMaterialfvf face pname ptr = glGetMaterialfv face pname (castPtr ptr) -foreign import CALLCONV unsafe "glMaterialfv" glMaterialff ::-   GLenum -> GLenum -> Ptr GLfloat -> IO ()+glMaterialff :: GLenum -> GLenum -> Ptr GLfloat -> IO ()+glMaterialff face pname ptr = glMaterialfv face pname (castPtr ptr)  maxShininess :: GettableStateVar GLfloat maxShininess = makeGettableStateVar $ getFloat1 id GetMaxShininess@@ -210,9 +204,6 @@                       buf       peek3 (\a d s -> (Index1 a, Index1 d, Index1 s)) buf -foreign import CALLCONV unsafe "glGetMaterialiv" glGetMaterialiv ::-   GLenum -> GLenum -> Ptr GLint -> IO ()- setMaterialColorIndexes ::    Face -> (Index1 GLint, Index1 GLint, Index1 GLint) -> IO () setMaterialColorIndexes face (Index1 a, Index1 d, Index1 s) =@@ -220,9 +211,6 @@       glMaterialiv (marshalFace face)                    (marshalMaterialParameter MaterialColorIndexes) -foreign import CALLCONV unsafe "glMaterialiv" glMaterialiv ::-   GLenum -> GLenum -> Ptr GLint -> IO ()- --------------------------------------------------------------------------------  data LightParameter =@@ -239,16 +227,16 @@  marshalLightParameter :: LightParameter -> GLenum marshalLightParameter x = case x of-   Ambient' -> 0x1200-   Diffuse' -> 0x1201-   Specular' -> 0x1202-   Position -> 0x1203-   SpotDirection -> 0x1204-   SpotExponent -> 0x1205-   SpotCutoff -> 0x1206-   ConstantAttenuation -> 0x1207-   LinearAttenuation -> 0x1208-   QuadraticAttenuation -> 0x1209+   Ambient' -> gl_AMBIENT+   Diffuse' -> gl_DIFFUSE+   Specular' -> gl_SPECULAR+   Position -> gl_POSITION+   SpotDirection -> gl_SPOT_DIRECTION+   SpotExponent -> gl_SPOT_EXPONENT+   SpotCutoff -> gl_SPOT_CUTOFF+   ConstantAttenuation -> gl_CONSTANT_ATTENUATION+   LinearAttenuation -> gl_LINEAR_ATTENUATION+   QuadraticAttenuation -> gl_QUADRATIC_ATTENUATION  -------------------------------------------------------------------------------- @@ -276,22 +264,22 @@          getLightVar = \l -> alloca $ \buf -> do getter l lp buf ; peek buf          setLightVar = \val l -> with val $ setter l lp -foreign import CALLCONV unsafe "glGetLightfv" glGetLightfvc ::-   GLenum -> GLenum -> Ptr (Color4 GLfloat) -> IO ()+glGetLightfvc :: GLenum -> GLenum -> Ptr (Color4 GLfloat) -> IO ()+glGetLightfvc l pname ptr = glGetLightfv l pname (castPtr ptr) -foreign import CALLCONV unsafe "glLightfv" glLightfvc ::-   GLenum -> GLenum -> Ptr (Color4 GLfloat) -> IO ()+glLightfvc :: GLenum -> GLenum -> Ptr (Color4 GLfloat) -> IO ()+glLightfvc l pname ptr = glLightfv l pname (castPtr ptr)  --------------------------------------------------------------------------------  position :: Light -> StateVar (Vertex4 GLfloat) position = makeLightVar glGetLightfvv glLightfvv Position (Vertex4 0 0 0 0) -foreign import CALLCONV unsafe "glLightfv" glLightfvv ::-   GLenum -> GLenum -> Ptr (Vertex4 GLfloat) -> IO ()+glLightfvv :: GLenum -> GLenum -> Ptr (Vertex4 GLfloat) -> IO ()+glLightfvv l pname ptr = glLightfv l pname (castPtr ptr) -foreign import CALLCONV unsafe "glGetLightfv" glGetLightfvv ::-   GLenum -> GLenum -> Ptr (Vertex4 GLfloat) -> IO ()+glGetLightfvv :: GLenum -> GLenum -> Ptr (Vertex4 GLfloat) -> IO ()+glGetLightfvv l pname ptr = glGetLightfv l pname (castPtr ptr)  -------------------------------------------------------------------------------- @@ -299,23 +287,17 @@ spotDirection =    makeLightVar glGetLightfvn glLightfvn SpotDirection (Normal3 0 0 0) -foreign import CALLCONV unsafe "glLightfv" glLightfvn ::-   GLenum -> GLenum -> Ptr (Normal3 GLfloat) -> IO ()+glLightfvn :: GLenum -> GLenum -> Ptr (Normal3 GLfloat) -> IO ()+glLightfvn l pname ptr = glLightfv l pname (castPtr ptr) -foreign import CALLCONV unsafe "glGetLightfv" glGetLightfvn ::-   GLenum -> GLenum -> Ptr (Normal3 GLfloat) -> IO ()+glGetLightfvn :: GLenum -> GLenum -> Ptr (Normal3 GLfloat) -> IO ()+glGetLightfvn l pname ptr = glGetLightfv l pname (castPtr ptr)  --------------------------------------------------------------------------------  spotExponent :: Light -> StateVar GLfloat spotExponent = makeLightVar glGetLightfv glLightfv SpotExponent 0 -foreign import CALLCONV unsafe "glLightfv" glLightfv ::-   GLenum -> GLenum -> Ptr GLfloat -> IO ()--foreign import CALLCONV unsafe "glGetLightfv" glGetLightfv ::-   GLenum -> GLenum -> Ptr GLfloat -> IO ()- maxSpotExponent :: GettableStateVar GLfloat maxSpotExponent = makeGettableStateVar $ getFloat1 id GetMaxSpotExponent @@ -357,10 +339,10 @@  marshalLightModelParameter :: LightModelParameter -> GLenum marshalLightModelParameter x = case x of-   LightModelAmbient -> 0xb53-   LightModelLocalViewer -> 0xb51-   LightModelTwoSide -> 0xb52-   LightModelColorControl -> 0x81f8+   LightModelAmbient -> gl_LIGHT_MODEL_AMBIENT+   LightModelLocalViewer -> gl_LIGHT_MODEL_LOCAL_VIEWER+   LightModelTwoSide -> gl_LIGHT_MODEL_TWO_SIDE+   LightModelColorControl -> gl_LIGHT_MODEL_COLOR_CONTROL  -------------------------------------------------------------------------------- @@ -369,10 +351,7 @@    makeStateVar       (getFloat4 Color4 GetLightModelAmbient)       (\c -> with c $-                glLightModelfv (marshalLightModelParameter LightModelAmbient))--foreign import CALLCONV unsafe "glLightModelfv" glLightModelfv ::-   GLenum -> Ptr (Color4 GLfloat) -> IO ()+                glLightModelfv (marshalLightModelParameter LightModelAmbient) . castPtr)  -------------------------------------------------------------------------------- @@ -387,9 +366,6 @@       (glLightModeli (marshalLightModelParameter lightModelParameter) .                      fromIntegral . marshalCapability) -foreign import CALLCONV unsafe "glLightModeli" glLightModeli ::-   GLenum -> GLint -> IO ()- --------------------------------------------------------------------------------  lightModelTwoSide :: StateVar Capability@@ -407,13 +383,13 @@  marshalLightModelColorControl :: LightModelColorControl -> GLenum marshalLightModelColorControl x = case x of-   SingleColor -> 0x81f9-   SeparateSpecularColor -> 0x81fa+   SingleColor -> gl_SINGLE_COLOR+   SeparateSpecularColor -> gl_SEPARATE_SPECULAR_COLOR  unmarshalLightModelColorControl :: GLenum -> LightModelColorControl unmarshalLightModelColorControl x-   | x == 0x81f9 = SingleColor-   | x == 0x81fa = SeparateSpecularColor+   | x == gl_SINGLE_COLOR = SingleColor+   | x == gl_SEPARATE_SPECULAR_COLOR = SeparateSpecularColor    | otherwise = error ("unmarshalLightModelColorControl: illegal value " ++ show x)  --------------------------------------------------------------------------------@@ -437,19 +413,19 @@  marshalColorMaterialParameter :: ColorMaterialParameter -> GLenum marshalColorMaterialParameter x = case x of-   Ambient -> 0x1200-   Diffuse -> 0x1201-   Specular -> 0x1202-   Emission -> 0x1600-   AmbientAndDiffuse -> 0x1602+   Ambient -> gl_AMBIENT+   Diffuse -> gl_DIFFUSE+   Specular -> gl_SPECULAR+   Emission -> gl_EMISSION+   AmbientAndDiffuse -> gl_AMBIENT_AND_DIFFUSE  unmarshalColorMaterialParameter :: GLenum -> ColorMaterialParameter unmarshalColorMaterialParameter x-   | x == 0x1200 = Ambient-   | x == 0x1201 = Diffuse-   | x == 0x1202 = Specular-   | x == 0x1600 = Emission-   | x == 0x1602 = AmbientAndDiffuse+   | x == gl_AMBIENT = Ambient+   | x == gl_DIFFUSE = Diffuse+   | x == gl_SPECULAR = Specular+   | x == gl_EMISSION = Emission+   | x == gl_AMBIENT_AND_DIFFUSE = AmbientAndDiffuse    | otherwise = error ("unmarshalColorMaterialParameter: illegal value " ++ show x)  --------------------------------------------------------------------------------@@ -465,9 +441,6 @@       (\(face, param) -> glColorMaterial (marshalFace face)                                          (marshalColorMaterialParameter param)) -foreign import CALLCONV unsafe "glColorMaterial" glColorMaterial ::-   GLenum -> GLenum -> IO ()- --------------------------------------------------------------------------------  data ShadingModel =@@ -477,13 +450,13 @@  marshalShadingModel :: ShadingModel -> GLenum marshalShadingModel x = case x of-   Flat -> 0x1d00-   Smooth -> 0x1d01+   Flat -> gl_FLAT+   Smooth -> gl_SMOOTH  unmarshalShadingModel :: GLenum -> ShadingModel unmarshalShadingModel x-   | x == 0x1d00 = Flat-   | x == 0x1d01 = Smooth+   | x == gl_FLAT = Flat+   | x == gl_SMOOTH = Smooth    | otherwise = error ("unmarshalShadingModel: illegal value " ++ show x)  --------------------------------------------------------------------------------@@ -493,5 +466,3 @@    makeStateVar       (getEnum1 unmarshalShadingModel GetShadeModel)       (glShadeModel . marshalShadingModel)--foreign import CALLCONV unsafe "glShadeModel" glShadeModel :: GLenum -> IO ()

@@ -18,7 +18,7 @@    unmarshalComparisonFunction ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -35,23 +35,23 @@  marshalComparisonFunction :: ComparisonFunction -> GLenum marshalComparisonFunction x = case x of-   Never -> 0x200-   Less -> 0x201-   Equal -> 0x202-   Lequal -> 0x203-   Greater -> 0x204-   Notequal -> 0x205-   Gequal -> 0x206-   Always -> 0x207+   Never -> gl_NEVER+   Less -> gl_LESS+   Equal -> gl_EQUAL+   Lequal -> gl_LEQUAL+   Greater -> gl_GREATER+   Notequal -> gl_NOTEQUAL+   Gequal -> gl_GEQUAL+   Always -> gl_ALWAYS  unmarshalComparisonFunction :: GLenum -> ComparisonFunction unmarshalComparisonFunction x-   | x == 0x200 = Never-   | x == 0x201 = Less-   | x == 0x202 = Equal-   | x == 0x203 = Lequal-   | x == 0x204 = Greater-   | x == 0x205 = Notequal-   | x == 0x206 = Gequal-   | x == 0x207 = Always+   | x == gl_NEVER = Never+   | x == gl_LESS = Less+   | x == gl_EQUAL = Equal+   | x == gl_LEQUAL = Lequal+   | x == gl_GREATER = Greater+   | x == gl_NOTEQUAL = Notequal+   | x == gl_GEQUAL = Gequal+   | x == gl_ALWAYS = Always    | otherwise = error ("unmarshalComparisonFunction: illegal value " ++ show x)

@@ -17,15 +17,20 @@    ControlPoint(..) ) where -import Foreign.Ptr ( Ptr )-import Foreign.Storable ( Storable(peek,poke) )-import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum )-import Graphics.Rendering.OpenGL.GL.Capability ( EnableCap(..) )-import Graphics.Rendering.OpenGL.GL.Domain ( Domain )-import Graphics.Rendering.OpenGL.GL.VertexArrays ( Stride )-import Graphics.Rendering.OpenGL.GL.VertexSpec (-   Vertex3, Vertex4, Index1, Color4, Normal3, TexCoord1, TexCoord2, TexCoord3,-   TexCoord4 )+import Data.Tensor+import Foreign.Ptr+import Foreign.Storable+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.Domain+import Graphics.Rendering.OpenGL.GL.VertexArrays+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.Raw.Core31+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   gl_MAP1_COLOR_4, gl_MAP1_INDEX, gl_MAP1_NORMAL, gl_MAP1_TEXTURE_COORD_1,+   gl_MAP1_TEXTURE_COORD_2, gl_MAP1_TEXTURE_COORD_3, gl_MAP1_TEXTURE_COORD_4,+   gl_MAP1_VERTEX_3, gl_MAP2_COLOR_4, gl_MAP2_INDEX, gl_MAP2_NORMAL,+   gl_MAP2_TEXTURE_COORD_1, gl_MAP2_TEXTURE_COORD_2, gl_MAP2_TEXTURE_COORD_3,+   gl_MAP2_TEXTURE_COORD_4, gl_MAP2_VERTEX_3, gl_MAP2_VERTEX_4 )  -------------------------------------------------------------------------------- @@ -143,21 +148,21 @@  marshalMapTarget :: MapTarget -> GLenum marshalMapTarget x = case x of-   Map1Color4 -> 0xd90-   Map1Index -> 0xd91-   Map1Normal -> 0xd92-   Map1TextureCoord1 -> 0xd93-   Map1TextureCoord2 -> 0xd94-   Map1TextureCoord3 -> 0xd95-   Map1TextureCoord4 -> 0xd96-   Map1Vertex3 -> 0xd97-   Map1Vertex4 -> 0xd98-   Map2Color4 -> 0xdb0-   Map2Index -> 0xdb1-   Map2Normal -> 0xdb2-   Map2TextureCoord1 -> 0xdb3-   Map2TextureCoord2 -> 0xdb4-   Map2TextureCoord3 -> 0xdb5-   Map2TextureCoord4 -> 0xdb6-   Map2Vertex3 -> 0xdb7-   Map2Vertex4 -> 0xdb8+   Map1Color4 -> gl_MAP1_COLOR_4+   Map1Index -> gl_MAP1_INDEX+   Map1Normal -> gl_MAP1_NORMAL+   Map1TextureCoord1 -> gl_MAP1_TEXTURE_COORD_1+   Map1TextureCoord2 -> gl_MAP1_TEXTURE_COORD_2+   Map1TextureCoord3 -> gl_MAP1_TEXTURE_COORD_3+   Map1TextureCoord4 -> gl_MAP1_TEXTURE_COORD_4+   Map1Vertex3 -> gl_MAP1_VERTEX_3+   Map1Vertex4 -> gl_MAP1_VERTEX_3+   Map2Color4 -> gl_MAP2_COLOR_4+   Map2Index -> gl_MAP2_INDEX+   Map2Normal -> gl_MAP2_NORMAL+   Map2TextureCoord1 -> gl_MAP2_TEXTURE_COORD_1+   Map2TextureCoord2 -> gl_MAP2_TEXTURE_COORD_2+   Map2TextureCoord3 -> gl_MAP2_TEXTURE_COORD_3+   Map2TextureCoord4 -> gl_MAP2_TEXTURE_COORD_4+   Map2Vertex3 -> gl_MAP2_VERTEX_3+   Map2Vertex4 -> gl_MAP2_VERTEX_4

@@ -20,7 +20,6 @@     -- * Matrices    MatrixMode(..), matrixMode,-   Vector1(..), Vector2(..), Vector3(..), Vector4(..),    MatrixOrder(..), MatrixComponent(rotate,translate,scale), Matrix(..),    currentMatrix, matrix, multMatrix, GLmatrix, loadIdentity,    ortho, frustum, depthClamp,@@ -35,49 +34,33 @@    Plane(..), TextureCoordName(..), TextureGenMode(..), textureGenMode ) where -import Foreign.ForeignPtr ( ForeignPtr, mallocForeignPtrArray, withForeignPtr )-import Foreign.Marshal.Alloc ( alloca )-import Foreign.Marshal.Array ( allocaArray, peekArray, pokeArray, withArray )-import Foreign.Marshal.Utils ( with )-import Foreign.Ptr ( Ptr, castPtr )-import Foreign.Storable ( Storable(..) )-import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapRescaleNormal, CapNormalize,CapDepthClamp,-             CapTextureGenS, CapTextureGenT,-             CapTextureGenR, CapTextureGenQ),-   makeCapability, makeStateVarMaybe )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLenum, GLint, GLsizei, GLfloat, GLdouble, GLclampd, Capability(..) )-import Graphics.Rendering.OpenGL.GL.Exception ( bracket, unsafeBracket_ )-import Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO, Invoker, getProcAddress )-import Graphics.Rendering.OpenGL.GL.PeekPoke ( peek1, peek4, poke4 )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetDepthRange,GetViewport,GetMaxViewportDims,GetMatrixMode,-            GetModelviewMatrix,GetProjectionMatrix,-            GetTextureMatrix, GetColorMatrix,GetMatrixPalette,GetActiveTexture,-            GetCurrentMatrixStackDepth,GetModelviewStackDepth,-            GetMaxModelviewStackDepth,GetProjectionStackDepth,-            GetMaxProjectionStackDepth,GetTextureStackDepth,-            GetMaxTextureStackDepth,GetColorMatrixStackDepth,-            GetMaxColorMatrixStackDepth,GetMaxMatrixPaletteStackDepth),-   getInteger2, getInteger4, getEnum1, getSizei1, getFloatv,-   getDouble2, getDoublev, modelviewIndexToEnum, modelviewEnumToIndex )-import Graphics.Rendering.OpenGL.GL.StateVar (-   GettableStateVar, makeGettableStateVar, HasGetter(get), HasSetter(($=)),-   StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GL.Tensor (-   Vector1(..), Vector2(..), Vector3(..), Vector4(..) )-import Graphics.Rendering.OpenGL.GL.Texturing.TextureUnit (-   marshalTextureUnit, unmarshalTextureUnit )-import Graphics.Rendering.OpenGL.GL.VertexSpec ( TextureUnit )-import Graphics.Rendering.OpenGL.GLU.ErrorsInternal (-   recordInvalidEnum, recordInvalidValue )------------------------------------------------------------------------------------#include "HsOpenGLExt.h"-#include "HsOpenGLTypes.h"+import Data.StateVar+import Data.Tensor+import Foreign.C.Types+import Foreign.ForeignPtr+import Foreign.Marshal.Alloc+import Foreign.Marshal.Array+import Foreign.Marshal.Utils+import Foreign.Ptr+import Foreign.Storable+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.Exception+import Graphics.Rendering.OpenGL.GL.PeekPoke+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.Texturing.TextureUnit+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.GLU.ErrorsInternal+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glFrustum, glGetTexGendv, glGetTexGeniv, glLoadIdentity, glLoadMatrixd,+   glLoadMatrixf, glLoadTransposeMatrixd, glLoadTransposeMatrixf, glMatrixMode,+   glMultMatrixd, glMultMatrixf, glMultTransposeMatrixd, glMultTransposeMatrixf,+   glOrtho, glPopMatrix, glPushMatrix, glRotated, glRotatef, glScaled, glScalef,+   glTexGendv, glTexGeni, glTranslated, glTranslatef, gl_EYE_LINEAR,+   gl_EYE_PLANE, gl_NORMAL_MAP, gl_OBJECT_LINEAR, gl_OBJECT_PLANE,+   gl_PROJECTION, gl_Q, gl_R, gl_REFLECTION_MAP, gl_S, gl_SPHERE_MAP, gl_T,+   gl_TEXTURE_GEN_MODE )+import Graphics.Rendering.OpenGL.Raw.ARB.MatrixPalette ( gl_MATRIX_PALETTE )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -98,9 +81,6 @@ depthRange :: StateVar (GLclampd, GLclampd) depthRange = makeStateVar (getDouble2 (,) GetDepthRange) (uncurry glDepthRange) -foreign import CALLCONV unsafe "glDepthRange" glDepthRange ::-   GLclampd -> GLclampd -> IO ()- --------------------------------------------------------------------------------  -- | A 2-dimensional position, measured in pixels.@@ -133,9 +113,6 @@                         (\(Position x y, Size w h) -> glViewport x y w h)    where makeVp x y w h = (Position x y, Size (fromIntegral w) (fromIntegral h)) -foreign import CALLCONV unsafe "glViewport" glViewport ::-   GLint -> GLint -> GLsizei -> GLsizei -> IO ()- -- | The implementation-dependent maximum viewport width and height.  maxViewportDims :: GettableStateVar Size@@ -156,17 +133,17 @@ marshalMatrixMode :: MatrixMode -> Maybe GLenum marshalMatrixMode x = case x of    Modelview i -> modelviewIndexToEnum i-   Projection -> Just 0x1701-   Texture -> Just 0x1702-   Color -> Just 0x1800-   MatrixPalette -> Just 0x8840+   Projection -> Just gl_PROJECTION+   Texture -> Just gl_TEXTURE+   Color -> Just gl_COLOR+   MatrixPalette -> Just gl_MATRIX_PALETTE  unmarshalMatrixMode :: GLenum -> MatrixMode unmarshalMatrixMode x-   | x == 0x1701 = Projection-   | x == 0x1702 = Texture-   | x == 0x1800 = Color-   | x == 0x8840 = MatrixPalette+   | x == gl_PROJECTION = Projection+   | x == gl_TEXTURE = Texture+   | x == gl_COLOR = Color+   | x == gl_MATRIX_PALETTE = MatrixPalette    | otherwise =         case modelviewEnumToIndex x of            Just i -> Modelview i@@ -206,8 +183,6 @@    makeStateVar (getEnum1 unmarshalMatrixMode GetMatrixMode)                 (maybe recordInvalidValue glMatrixMode . marshalMatrixMode) -foreign import CALLCONV unsafe "glMatrixMode" glMatrixMode :: GLenum -> IO ()- --------------------------------------------------------------------------------  data MatrixOrder = ColumnMajor | RowMajor@@ -225,51 +200,30 @@    translate :: Vector3 c -> IO ()    scale :: c -> c -> c -> IO () -instance MatrixComponent GLfloat_ where+-- GLfloat instance+instance MatrixComponent CFloat where    getMatrix = getFloatv    loadMatrix = glLoadMatrixf-   loadTransposeMatrix = glLoadTransposeMatrixfARB+   loadTransposeMatrix = glLoadTransposeMatrixf    multMatrix_ = glMultMatrixf-   multTransposeMatrix = glMultTransposeMatrixfARB+   multTransposeMatrix = glMultTransposeMatrixf    rotate a (Vector3 x y z) = glRotatef a x y z    translate (Vector3 x y z) = glTranslatef x y z    scale = glScalef -instance MatrixComponent GLdouble_ where+-- GLfloat instance+instance MatrixComponent CDouble where    getMatrix = getDoublev    loadMatrix = glLoadMatrixd-   loadTransposeMatrix = glLoadTransposeMatrixdARB+   loadTransposeMatrix = glLoadTransposeMatrixd    multMatrix_ = glMultMatrixd-   multTransposeMatrix = glMultTransposeMatrixdARB+   multTransposeMatrix = glMultTransposeMatrixd    rotate a (Vector3 x y z) = glRotated a x y z    translate (Vector3 x y z) = glTranslated x y z    scale = glScaled  -------------------------------------------------------------------------------- -foreign import CALLCONV unsafe "glLoadMatrixf" glLoadMatrixf :: Ptr GLfloat -> IO ()-foreign import CALLCONV unsafe "glLoadMatrixd" glLoadMatrixd :: Ptr GLdouble -> IO ()--EXTENSION_ENTRY("GL_ARB_transpose_matrix or OpenGL 1.3",glLoadTransposeMatrixfARB,Ptr GLfloat -> IO ())-EXTENSION_ENTRY("GL_ARB_transpose_matrix or OpenGL 1.3",glLoadTransposeMatrixdARB,Ptr GLdouble -> IO ())--foreign import CALLCONV unsafe "glMultMatrixf" glMultMatrixf :: Ptr GLfloat -> IO ()-foreign import CALLCONV unsafe "glMultMatrixd" glMultMatrixd :: Ptr GLdouble -> IO ()--EXTENSION_ENTRY("GL_ARB_transpose_matrix or OpenGL 1.3",glMultTransposeMatrixfARB,Ptr GLfloat -> IO ())-EXTENSION_ENTRY("GL_ARB_transpose_matrix or OpenGL 1.3",glMultTransposeMatrixdARB,Ptr GLdouble -> IO ())--foreign import CALLCONV unsafe "glRotatef" glRotatef :: GLfloat -> GLfloat -> GLfloat -> GLfloat -> IO ()-foreign import CALLCONV unsafe "glRotated" glRotated :: GLdouble -> GLdouble -> GLdouble -> GLdouble -> IO ()--foreign import CALLCONV unsafe "glTranslatef" glTranslatef :: GLfloat -> GLfloat -> GLfloat -> IO ()-foreign import CALLCONV unsafe "glTranslated" glTranslated :: GLdouble -> GLdouble -> GLdouble -> IO ()--foreign import CALLCONV unsafe "glScalef" glScalef :: GLfloat -> GLfloat -> GLfloat -> IO ()-foreign import CALLCONV unsafe "glScaled" glScaled :: GLdouble -> GLdouble -> GLdouble -> IO ()----------------------------------------------------------------------------------- class Matrix m where    -- | Create a new matrix of the given order (containing undefined elements)    -- and call the action to fill it with 4x4 elements.@@ -344,14 +298,7 @@ --------------------------------------------------------------------------------  data GLmatrix a = GLmatrix MatrixOrder (ForeignPtr a)-#ifdef __HADDOCK__--- Help Haddock a bit, because it doesn't do any instance inference.-instance Eq (GLmatrix a)-instance Ord (GLmatrix a)-instance Show (GLmatrix a)-#else    deriving ( Eq, Ord, Show )-#endif  instance Matrix GLmatrix where    withNewMatrix order f = do@@ -363,15 +310,16 @@  -------------------------------------------------------------------------------- -foreign import CALLCONV unsafe "glLoadIdentity" loadIdentity :: IO ()+loadIdentity :: IO ()+loadIdentity = glLoadIdentity  -------------------------------------------------------------------------------- -foreign import CALLCONV unsafe "glOrtho" ortho ::-   GLdouble -> GLdouble -> GLdouble -> GLdouble -> GLdouble -> GLdouble -> IO ()+ortho :: GLdouble -> GLdouble -> GLdouble -> GLdouble -> GLdouble -> GLdouble -> IO ()+ortho = glOrtho -foreign import CALLCONV unsafe "glFrustum" frustum ::-   GLdouble -> GLdouble -> GLdouble -> GLdouble -> GLdouble -> GLdouble -> IO ()+frustum :: GLdouble -> GLdouble -> GLdouble -> GLdouble -> GLdouble -> GLdouble -> IO ()+frustum = glFrustum  -------------------------------------------------------------------------------- @@ -382,9 +330,7 @@  activeTexture :: StateVar TextureUnit activeTexture = makeStateVar (getEnum1 unmarshalTextureUnit GetActiveTexture)-                             (glActiveTextureARB . marshalTextureUnit)--EXTENSION_ENTRY("GL_ARB_multitexture or OpenGL 1.3",glActiveTextureARB,GLenum -> IO ())   +                             (glActiveTexture . marshalTextureUnit)  -------------------------------------------------------------------------------- @@ -409,10 +355,6 @@ unsafePreservingMatrix :: IO a -> IO a unsafePreservingMatrix = unsafeBracket_ glPushMatrix glPopMatrix -foreign import CALLCONV unsafe "glPushMatrix" glPushMatrix :: IO ()--foreign import CALLCONV unsafe "glPopMatrix" glPopMatrix :: IO ()- --------------------------------------------------------------------------------  stackDepth :: Maybe MatrixMode -> GettableStateVar GLsizei@@ -468,10 +410,10 @@  marshalTextureCoordName :: TextureCoordName -> GLenum marshalTextureCoordName x = case x of-   S -> 0x2000-   T -> 0x2001-   R -> 0x2002-   Q -> 0x2003+   S -> gl_S+   T -> gl_T+   R -> gl_R+   Q -> gl_Q  -------------------------------------------------------------------------------- @@ -482,9 +424,9 @@  marshalTextureGenParameter :: TextureGenParameter -> GLenum marshalTextureGenParameter x = case x of-   TextureGenMode -> 0x2500-   ObjectPlane -> 0x2501-   EyePlane -> 0x2502+   TextureGenMode -> gl_TEXTURE_GEN_MODE+   ObjectPlane -> gl_OBJECT_PLANE+   EyePlane -> gl_EYE_PLANE  -------------------------------------------------------------------------------- @@ -496,21 +438,22 @@    | ReflectionMap'  marshalTextureGenMode' :: TextureGenMode' -> GLint-marshalTextureGenMode' x = case x of-   EyeLinear' -> 0x2400-   ObjectLinear' -> 0x2401-   SphereMap' -> 0x2402-   NormalMap' -> 0x8511-   ReflectionMap' -> 0x8512+marshalTextureGenMode' x = fromIntegral $ case x of+   EyeLinear' -> gl_EYE_LINEAR+   ObjectLinear' -> gl_OBJECT_LINEAR+   SphereMap' -> gl_SPHERE_MAP+   NormalMap' -> gl_NORMAL_MAP+   ReflectionMap' -> gl_REFLECTION_MAP  unmarshalTextureGenMode' :: GLint -> TextureGenMode' unmarshalTextureGenMode' x-   | x == 0x2400 = EyeLinear'-   | x == 0x2401 = ObjectLinear'-   | x == 0x2402 = SphereMap'-   | x == 0x8511 = NormalMap'-   | x == 0x8512 = ReflectionMap'+   | y == gl_EYE_LINEAR = EyeLinear'+   | y == gl_OBJECT_LINEAR = ObjectLinear'+   | y == gl_SPHERE_MAP = SphereMap'+   | y == gl_NORMAL_MAP = NormalMap'+   | y == gl_REFLECTION_MAP = ReflectionMap'    | otherwise = error ("unmarshalTextureGenMode': illegal value " ++ show x)+   where y = fromIntegral x  -------------------------------------------------------------------------------- @@ -568,36 +511,24 @@                  buf    peek1 unmarshalTextureGenMode' buf -foreign import CALLCONV unsafe "glGetTexGeniv" glGetTexGeniv ::-   GLenum -> GLenum -> Ptr GLint -> IO ()- setMode :: TextureCoordName -> TextureGenMode -> IO () setMode coord mode =    glTexGeni (marshalTextureCoordName coord)              (marshalTextureGenParameter TextureGenMode)              (marshalTextureGenMode mode) -foreign import CALLCONV unsafe "glTexGeni" glTexGeni ::-    GLenum -> GLenum -> GLint -> IO ()- --------------------------------------------------------------------------------  getPlane :: TextureCoordName -> TextureGenParameter -> IO (Plane GLdouble) getPlane coord param = alloca $ \planeBuffer -> do    glGetTexGendv (marshalTextureCoordName coord)                  (marshalTextureGenParameter param)-                 planeBuffer+                 (castPtr planeBuffer)    peek planeBuffer -foreign import CALLCONV unsafe "glGetTexGendv" glGetTexGendv ::-   GLenum -> GLenum -> Ptr (Plane GLdouble) -> IO ()- setPlane :: TextureCoordName -> TextureGenParameter -> Plane GLdouble -> IO () setPlane coord param plane =    with plane $ \planeBuffer ->       glTexGendv (marshalTextureCoordName coord)                  (marshalTextureGenParameter param)-                 planeBuffer--foreign import CALLCONV unsafe "glTexGendv" glTexGendv ::-   GLenum -> GLenum -> Ptr (Plane GLdouble) -> IO ()+                 (castPtr planeBuffer)

@@ -17,7 +17,9 @@    DataType(..), marshalDataType, unmarshalDataType ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum )+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   gl_2_BYTES, gl_3_BYTES, gl_4_BYTES, gl_BITMAP )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -58,69 +60,73 @@  marshalDataType :: DataType -> GLenum marshalDataType x = case x of-   UnsignedByte -> 0x1401-   Byte -> 0x1400-   UnsignedShort -> 0x1403-   Short -> 0x1402-   UnsignedInt -> 0x1405-   Int -> 0x1404-   HalfFloat -> 0x140B-   Float -> 0x1406-   UnsignedByte332 -> 0x8032-   UnsignedByte233Rev -> 0x8362-   UnsignedShort565 -> 0x8363-   UnsignedShort565Rev -> 0x8364-   UnsignedShort4444 -> 0x8033-   UnsignedShort4444Rev -> 0x8365-   UnsignedShort5551 -> 0x8034-   UnsignedShort1555Rev -> 0x8366-   UnsignedInt8888 -> 0x8035-   UnsignedInt8888Rev -> 0x8367-   UnsignedInt1010102 -> 0x8036-   UnsignedInt2101010Rev -> 0x8368-   UnsignedInt248 -> 0x84fa-   UnsignedInt10f11f11fRev -> 0x8C3B-   UnsignedInt5999Rev -> 0x8C3E-   Float32UnsignedInt248Rev -> 0x8DAD-   Bitmap -> 0x1a00+   UnsignedByte -> gl_UNSIGNED_BYTE+   Byte -> gl_BYTE+   UnsignedShort -> gl_UNSIGNED_SHORT+   Short -> gl_SHORT+   UnsignedInt -> gl_UNSIGNED_INT+   Int -> gl_INT+   HalfFloat -> gl_HALF_FLOAT+   Float -> gl_FLOAT+   UnsignedByte332 -> gl_UNSIGNED_BYTE_3_3_2+   UnsignedByte233Rev -> gl_UNSIGNED_BYTE_2_3_3_REV+   UnsignedShort565 -> gl_UNSIGNED_SHORT_5_6_5+   UnsignedShort565Rev -> gl_UNSIGNED_SHORT_5_6_5_REV+   UnsignedShort4444 -> gl_UNSIGNED_SHORT_4_4_4_4+   UnsignedShort4444Rev -> gl_UNSIGNED_SHORT_4_4_4_4_REV+   UnsignedShort5551 -> gl_UNSIGNED_SHORT_5_5_5_1+   UnsignedShort1555Rev -> gl_UNSIGNED_SHORT_1_5_5_5_REV+   UnsignedInt8888 -> gl_UNSIGNED_INT_8_8_8_8+   UnsignedInt8888Rev -> gl_UNSIGNED_INT_8_8_8_8_REV+   UnsignedInt1010102 -> gl_UNSIGNED_INT_10_10_10_2+   UnsignedInt2101010Rev -> gl_UNSIGNED_INT_2_10_10_10_REV+   UnsignedInt248 -> gl_UNSIGNED_INT_24_8+   UnsignedInt10f11f11fRev -> gl_UNSIGNED_INT_10F_11F_11F_REV+   UnsignedInt5999Rev -> gl_UNSIGNED_INT_5_9_9_9_REV+   Float32UnsignedInt248Rev -> gl_FLOAT_32_UNSIGNED_INT_24_8_REV+   Bitmap -> gl_BITMAP+   -- TODO: Use UNSIGNED_SHORT_8_8_APPLE from APPLE_ycbcr_422 extension    UnsignedShort88 -> 0x85ba+   -- TODO: Use UNSIGNED_SHORT_8_8_REV_APPLE from APPLE_ycbcr_422 extension    UnsignedShort88Rev -> 0x85bb-   Double -> 0x140a-   TwoBytes -> 0x1407-   ThreeBytes -> 0x1408-   FourBytes -> 0x1409+   Double -> gl_DOUBLE+   TwoBytes -> gl_2_BYTES+   ThreeBytes -> gl_3_BYTES+   FourBytes -> gl_4_BYTES  unmarshalDataType :: GLenum -> DataType unmarshalDataType x-   | x == 0x1401 = UnsignedByte-   | x == 0x1400 = Byte-   | x == 0x1403 = UnsignedShort-   | x == 0x1402 = Short-   | x == 0x1405 = UnsignedInt-   | x == 0x1404 = Int-   | x == 0x140B = HalfFloat-   | x == 0x1406 = Float-   | x == 0x8032 = UnsignedByte332-   | x == 0x8362 = UnsignedByte233Rev-   | x == 0x8363 = UnsignedShort565-   | x == 0x8364 = UnsignedShort565Rev-   | x == 0x8033 = UnsignedShort4444-   | x == 0x8365 = UnsignedShort4444Rev-   | x == 0x8034 = UnsignedShort5551-   | x == 0x8366 = UnsignedShort1555Rev-   | x == 0x8035 = UnsignedInt8888-   | x == 0x8367 = UnsignedInt8888Rev-   | x == 0x8036 = UnsignedInt1010102-   | x == 0x8368 = UnsignedInt2101010Rev-   | x == 0x84fa = UnsignedInt248-   | x == 0x8C3B = UnsignedInt10f11f11fRev-   | x == 0x8C3E = UnsignedInt5999Rev-   | x == 0x8DAD = Float32UnsignedInt248Rev-   | x == 0x1a00 = Bitmap+   | x == gl_UNSIGNED_BYTE = UnsignedByte+   | x == gl_BYTE = Byte+   | x == gl_UNSIGNED_SHORT = UnsignedShort+   | x == gl_SHORT = Short+   | x == gl_UNSIGNED_INT = UnsignedInt+   | x == gl_INT = Int+   | x == gl_HALF_FLOAT = HalfFloat+   | x == gl_FLOAT = Float+   | x == gl_UNSIGNED_BYTE_3_3_2 = UnsignedByte332+   | x == gl_UNSIGNED_BYTE_2_3_3_REV = UnsignedByte233Rev+   | x == gl_UNSIGNED_SHORT_5_6_5 = UnsignedShort565+   | x == gl_UNSIGNED_SHORT_5_6_5_REV = UnsignedShort565Rev+   | x == gl_UNSIGNED_SHORT_4_4_4_4 = UnsignedShort4444+   | x == gl_UNSIGNED_SHORT_4_4_4_4_REV = UnsignedShort4444Rev+   | x == gl_UNSIGNED_SHORT_5_5_5_1 = UnsignedShort5551+   | x == gl_UNSIGNED_SHORT_1_5_5_5_REV = UnsignedShort1555Rev+   | x == gl_UNSIGNED_INT_8_8_8_8 = UnsignedInt8888+   | x == gl_UNSIGNED_INT_8_8_8_8_REV = UnsignedInt8888Rev+   | x == gl_UNSIGNED_INT_10_10_10_2 = UnsignedInt1010102+   | x == gl_UNSIGNED_INT_2_10_10_10_REV = UnsignedInt2101010Rev+   | x == gl_UNSIGNED_INT_24_8 = UnsignedInt248+   | x == gl_UNSIGNED_INT_10F_11F_11F_REV = UnsignedInt10f11f11fRev+   | x == gl_UNSIGNED_INT_5_9_9_9_REV = UnsignedInt5999Rev+   | x == gl_FLOAT_32_UNSIGNED_INT_24_8_REV = Float32UnsignedInt248Rev+   | x == gl_BITMAP = Bitmap+   -- TODO: Use UNSIGNED_SHORT_8_8_APPLE from APPLE_ycbcr_422 extension    | x == 0x85ba = UnsignedShort88+   -- TODO: Use UNSIGNED_SHORT_8_8_REV_APPLE from APPLE_ycbcr_422 extension    | x == 0x85bb = UnsignedShort88Rev-   | x == 0x140a = Double-   | x == 0x1407 = TwoBytes-   | x == 0x1408 = ThreeBytes-   | x == 0x1409 = FourBytes+   | x == gl_DOUBLE = Double+   | x == gl_2_BYTES = TwoBytes+   | x == gl_3_BYTES = ThreeBytes+   | x == gl_4_BYTES = FourBytes    | otherwise = error ("unmarshalDataType: illegal value " ++ show x)

@@ -25,20 +25,19 @@    genLists, deleteLists, isList, ) where -import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLboolean, GLuint, GLsizei, GLenum )-import Graphics.Rendering.OpenGL.GL.BufferObjects ( ObjectName(..) )-import Graphics.Rendering.OpenGL.GL.DataType ( marshalDataType )-import Graphics.Rendering.OpenGL.GL.VertexArrays ( DataType )-import Graphics.Rendering.OpenGL.GL.Exception ( bracket_ )-import Graphics.Rendering.OpenGL.GL.GLboolean ( unmarshalGLboolean )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetListIndex,GetListMode,GetMaxListNesting,GetListBase),-   getEnum1, getSizei1 )-import Graphics.Rendering.OpenGL.GL.StateVar (-   GettableStateVar, makeGettableStateVar, StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GLU.ErrorsInternal ( recordOutOfMemory )+import Data.ObjectName+import Data.StateVar+import Foreign.Ptr+import Graphics.Rendering.OpenGL.GL.DataType+import Graphics.Rendering.OpenGL.GL.Exception+import Graphics.Rendering.OpenGL.GL.GLboolean+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.VertexArrays+import Graphics.Rendering.OpenGL.GLU.ErrorsInternal+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+ glCallList, glCallLists, glDeleteLists, glEndList, glGenLists, glIsList,+ glListBase, glNewList, gl_COMPILE, gl_COMPILE_AND_EXECUTE )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -64,8 +63,6 @@               return []       else return [ DisplayList l | l <- [ first .. first + fromIntegral n - 1 ] ] -foreign import CALLCONV unsafe "glGenLists" glGenLists :: GLsizei -> IO GLuint- --------------------------------------------------------------------------------  {-# DEPRECATED deleteLists "use `deleteObjectNames' instead" #-}@@ -75,12 +72,9 @@ deleteLists_ :: [DisplayList] -> IO () deleteLists_ = mapM_ (uncurry glDeleteLists) . combineConsecutive -foreign import CALLCONV unsafe "glDeleteLists" glDeleteLists ::-   DisplayList -> GLsizei -> IO ()--combineConsecutive :: [DisplayList] -> [(DisplayList, GLsizei)]+combineConsecutive :: [DisplayList] -> [(GLuint, GLsizei)] combineConsecutive []     = []-combineConsecutive (z:zs) = (z, len) : combineConsecutive rest+combineConsecutive (z@(DisplayList dl) :zs) = (dl, len) : combineConsecutive rest    where (len, rest) = run (0 :: GLsizei) z zs          run n x xs = case n + 1 of                          m -> case xs of@@ -96,10 +90,7 @@ isList = isList_  isList_ :: DisplayList -> IO Bool-isList_ = fmap unmarshalGLboolean . glIsList--foreign import CALLCONV unsafe "glIsList" glIsList ::-   DisplayList -> IO GLboolean+isList_ (DisplayList dl) = fmap unmarshalGLboolean (glIsList dl)  -------------------------------------------------------------------------------- @@ -110,24 +101,19 @@  marshalListMode :: ListMode -> GLenum marshalListMode x = case x of-   Compile -> 0x1300-   CompileAndExecute -> 0x1301+   Compile -> gl_COMPILE+   CompileAndExecute -> gl_COMPILE_AND_EXECUTE  unmarshalListMode :: GLenum -> ListMode unmarshalListMode x-   | x == 0x1300 = Compile-   | x == 0x1301 = CompileAndExecute+   | x == gl_COMPILE = Compile+   | x == gl_COMPILE_AND_EXECUTE = CompileAndExecute    | otherwise = error ("unmarshalListMode: illegal value " ++ show x)  --------------------------------------------------------------------------------  defineList :: DisplayList -> ListMode -> IO a -> IO a-defineList lst mode = bracket_ (glNewList lst (marshalListMode mode)) glEndList--foreign import CALLCONV unsafe "glNewList" glNewList ::-   DisplayList -> GLenum -> IO ()--foreign import CALLCONV unsafe "glEndList" glEndList :: IO ()+defineList (DisplayList dl) mode = bracket_ (glNewList dl (marshalListMode mode)) glEndList  defineNewList :: ListMode -> IO a -> IO DisplayList defineNewList mode action = do@@ -158,17 +144,13 @@  -------------------------------------------------------------------------------- -foreign import CALLCONV unsafe "glCallList" callList :: DisplayList -> IO ()+callList :: DisplayList -> IO ()+callList (DisplayList dl) = glCallList dl  callLists :: GLsizei -> DataType -> Ptr a -> IO () callLists n = glCallLists n . marshalDataType -foreign import CALLCONV unsafe "glCallLists" glCallLists ::-   GLsizei -> GLenum -> Ptr a -> IO ()- --------------------------------------------------------------------------------  listBase :: StateVar DisplayList-listBase = makeStateVar (getEnum1 DisplayList GetListBase) glListBase--foreign import CALLCONV unsafe "glListBase" glListBase :: DisplayList -> IO ()+listBase = makeStateVar (getEnum1 DisplayList GetListBase) (\(DisplayList dl) -> glListBase dl)

@@ -17,16 +17,16 @@    Domain(..) ) where -import Foreign.Ptr ( Ptr )-import Foreign.Storable ( Storable )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLenum, GLint, GLfloat, GLdouble )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName, getFloat2, getFloat4, getDouble2, getDouble4 )------------------------------------------------------------------------------------#include "HsOpenGLTypes.h"+import Foreign.C.Types+import Foreign.Ptr+import Foreign.Storable+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.Raw.Core31+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glEvalCoord1d, glEvalCoord1dv, glEvalCoord1f, glEvalCoord1fv, glEvalCoord2d,+   glEvalCoord2dv, glEvalCoord2f, glEvalCoord2fv, glGetMapdv, glGetMapfv,+   glMap1d, glMap1f, glMap2d, glMap2f, glMapGrid1d, glMapGrid1f, glMapGrid2d,+   glMapGrid2f )  -------------------------------------------------------------------------------- @@ -45,7 +45,8 @@  -------------------------------------------------------------------------------- -instance Domain GLfloat_ where+-- GLfloat instance+instance Domain CFloat where    glMap1      = glMap1f    glMap2      = glMap2f    glGetMapv   = glGetMapfv@@ -58,41 +59,8 @@    get2        = getFloat2    get4        = getFloat4 -foreign import CALLCONV unsafe "glMap1f" glMap1f ::-      GLenum-   -> GLfloat -> GLfloat -> GLint -> GLint-   -> Ptr GLfloat -> IO ()--foreign import CALLCONV unsafe "glMap2f" glMap2f ::-      GLenum-   -> GLfloat -> GLfloat -> GLint -> GLint-   -> GLfloat -> GLfloat -> GLint -> GLint-   -> Ptr GLfloat -> IO ()--foreign import CALLCONV unsafe "glGetMapfv" glGetMapfv ::-   GLenum -> GLenum -> Ptr GLfloat -> IO ()--foreign import CALLCONV unsafe "glEvalCoord1f" glEvalCoord1f ::-   GLfloat -> IO ()--foreign import CALLCONV unsafe "glEvalCoord1fv" glEvalCoord1fv ::-   Ptr GLfloat -> IO ()--foreign import CALLCONV unsafe "glEvalCoord2f" glEvalCoord2f ::-   GLfloat -> GLfloat -> IO ()--foreign import CALLCONV unsafe "glEvalCoord2fv" glEvalCoord2fv ::-   Ptr GLfloat -> IO ()--foreign import CALLCONV unsafe "glMapGrid1f" glMapGrid1f ::-   GLint -> GLfloat -> GLfloat -> IO ()--foreign import CALLCONV unsafe "glMapGrid2f" glMapGrid2f ::-   GLint -> GLfloat -> GLfloat -> GLint -> GLfloat -> GLfloat -> IO ()------------------------------------------------------------------------------------instance Domain GLdouble_ where+-- GLdouble instance+instance Domain CDouble where    glMap1      = glMap1d    glMap2      = glMap2d    glGetMapv   = glGetMapdv@@ -104,35 +72,3 @@    glMapGrid2  = glMapGrid2d    get2        = getDouble2    get4        = getDouble4--foreign import CALLCONV unsafe "glMap1d" glMap1d ::-      GLenum-   -> GLdouble -> GLdouble -> GLint -> GLint-   -> Ptr GLdouble -> IO ()--foreign import CALLCONV unsafe "glMap2d" glMap2d ::-      GLenum-   -> GLdouble -> GLdouble -> GLint -> GLint-   -> GLdouble -> GLdouble -> GLint -> GLint-   -> Ptr GLdouble -> IO ()--foreign import CALLCONV unsafe "glGetMapdv" glGetMapdv ::-   GLenum -> GLenum -> Ptr GLdouble -> IO ()--foreign import CALLCONV unsafe "glEvalCoord1d" glEvalCoord1d ::-   GLdouble -> IO ()--foreign import CALLCONV unsafe "glEvalCoord1dv" glEvalCoord1dv ::-   Ptr GLdouble -> IO ()--foreign import CALLCONV unsafe "glEvalCoord2d" glEvalCoord2d ::-   GLdouble -> GLdouble -> IO ()--foreign import CALLCONV unsafe "glEvalCoord2dv" glEvalCoord2dv ::-   Ptr GLdouble -> IO ()--foreign import CALLCONV unsafe "glMapGrid1d" glMapGrid1d ::-   GLint -> GLdouble -> GLdouble -> IO ()--foreign import CALLCONV unsafe "glMapGrid2d" glMapGrid2d ::-   GLint -> GLdouble -> GLdouble -> GLint -> GLdouble -> GLdouble -> IO ()

@@ -17,9 +17,8 @@    EdgeFlag(..), marshalEdgeFlag, unmarshalEdgeFlag ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLboolean )-import Graphics.Rendering.OpenGL.GL.GLboolean (-   marshalGLboolean, unmarshalGLboolean )+import Graphics.Rendering.OpenGL.Raw.Core31+import Graphics.Rendering.OpenGL.GL.GLboolean  -------------------------------------------------------------------------------- 

@@ -43,33 +43,26 @@    autoNormal ) where -import Control.Monad ( zipWithM_ )-import Data.List ( genericLength )-import Foreign.ForeignPtr ( ForeignPtr, mallocForeignPtrArray, withForeignPtr )-import Foreign.Marshal.Alloc ( alloca )-import Foreign.Marshal.Array ( allocaArray )-import Foreign.Ptr ( Ptr, plusPtr )-import Foreign.Storable ( Storable(peek,sizeOf) )-import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapAutoNormal), makeCapability, makeStateVarMaybe )+import Control.Monad+import Data.List+import Data.StateVar+import Foreign.ForeignPtr+import Foreign.Marshal.Alloc+import Foreign.Marshal.Array+import Foreign.Ptr+import Foreign.Storable+import Graphics.Rendering.OpenGL.GL.Capability import Graphics.Rendering.OpenGL.GL.ControlPoint import Graphics.Rendering.OpenGL.GL.Domain-import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum, GLint, Capability )-import Graphics.Rendering.OpenGL.GL.PeekPoke ( peek2, peek4 )-import Graphics.Rendering.OpenGL.GL.PolygonMode ( marshalPolygonMode )-import Graphics.Rendering.OpenGL.GL.Polygons ( PolygonMode )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetMaxEvalOrder,-            GetMap1GridSegments,GetMap1GridDomain,-            GetMap2GridSegments,GetMap2GridDomain),-   getSizei1, getInteger1, getInteger2 )-import Graphics.Rendering.OpenGL.GL.StateVar (-   GettableStateVar, makeGettableStateVar, StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GL.VertexArrays ( NumComponents, Stride )------------------------------------------------------------------------------------#include "HsOpenGLTypes.h"+import Graphics.Rendering.OpenGL.GL.PeekPoke+import Graphics.Rendering.OpenGL.GL.PolygonMode+import Graphics.Rendering.OpenGL.GL.Polygons+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.VertexArrays+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glEvalMesh1, glEvalMesh2, glEvalPoint1, glEvalPoint2, glGetMapiv, gl_COEFF,+   gl_DOMAIN, gl_ORDER )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -176,14 +169,7 @@  data (ControlPoint c, Domain d) => GLmap1 c d =    GLmap1 (MapDescriptor d) (ForeignPtr d)-#ifdef __HADDOCK__--- Help Haddock a bit, because it doesn't do any instance inference.-instance Eq d => Eq (GLmap1 c d)-instance Ord d => Ord (GLmap1 c d)-instance Show d => Show (GLmap1 c d)-#else    deriving ( Eq, Ord, Show )-#endif  instance Map1 GLmap1 where    withNewMap1 descriptor act = do@@ -283,14 +269,7 @@  data (ControlPoint c, Domain d) => GLmap2 c d =    GLmap2 (MapDescriptor d)  (MapDescriptor d) (ForeignPtr d)-#ifdef __HADDOCK__--- Help Haddock a bit, because it doesn't do any instance inference.-instance Eq d => Eq (GLmap2 c d)-instance Ord d => Ord (GLmap2 c d)-instance Show d => Show (GLmap2 c d)-#else    deriving ( Eq, Ord, Show )-#endif  instance Map2 GLmap2 where    withNewMap2 uDescriptor vDescriptor act = do@@ -347,14 +326,9 @@  marshalGetMapQuery :: GetMapQuery -> GLenum marshalGetMapQuery x = case x of-   Coeff -> 0xa00-   Order -> 0xa01-   Domain -> 0xa02------------------------------------------------------------------------------------foreign import CALLCONV unsafe "glGetMapiv" glGetMapiv ::-   GLenum -> GLenum -> Ptr GLint -> IO ()+   Coeff -> gl_COEFF+   Order -> gl_ORDER+   Domain -> gl_DOMAIN  -------------------------------------------------------------------------------- @@ -379,25 +353,16 @@ evalMesh1 :: PolygonMode -> (GLint, GLint) -> IO () evalMesh1 m (p1, p2) = glEvalMesh1 (marshalPolygonMode m) p1 p2 -foreign import CALLCONV unsafe "glEvalMesh1" glEvalMesh1 ::-   GLenum -> GLint -> GLint -> IO ()- evalMesh2 :: PolygonMode -> (GLint, GLint) -> (GLint, GLint) -> IO () evalMesh2 m (p1, p2) (q1, q2) = glEvalMesh2 (marshalPolygonMode m) p1 p2 q1 q2 -foreign import CALLCONV unsafe "glEvalMesh2" glEvalMesh2 ::-   GLenum -> GLint -> GLint -> GLint -> GLint -> IO ()- -------------------------------------------------------------------------------- -foreign import CALLCONV unsafe "glEvalPoint1" evalPoint1 ::-   GLint -> IO ()+evalPoint1 :: GLint -> IO ()+evalPoint1 = glEvalPoint1  evalPoint2 :: (GLint, GLint) -> IO () evalPoint2 = uncurry glEvalPoint2--foreign import CALLCONV unsafe "glEvalPoint2" glEvalPoint2 ::-   GLint -> GLint -> IO ()  -------------------------------------------------------------------------------- 

@@ -1,3 +1,4 @@+{-# LANGUAGE CPP #-} -- #hide -------------------------------------------------------------------------------- -- |

@@ -1,47 +0,0 @@--- #hide------------------------------------------------------------------------------------ |--- Module      :  Graphics.Rendering.OpenGL.GL.Extensions--- Copyright   :  (c) Sven Panne 2002-2009--- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- --- Maintainer  :  sven.panne@aedion.de--- Stability   :  stable--- Portability :  portable------ This is a purely internal module for handling the OpenGL extension--- mechanism.--------------------------------------------------------------------------------------module Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO,-   Invoker, getProcAddress   -- used only internally-) where--import Foreign.C.String ( CString, withCString )-import Foreign.Ptr ( FunPtr, nullFunPtr )-import System.IO.Unsafe ( unsafePerformIO )--#ifdef __HUGS__-{-# CFILES cbits/HsOpenGL.c #-}-#endif------------------------------------------------------------------------------------type Invoker a = FunPtr a -> a--getProcAddress :: String -> String -> IO (FunPtr a)-getProcAddress ext call =-   throwIfNull ("unknown OpenGL call " ++ call ++ ", check for " ++ ext) $-      withCString call hs_OpenGL_getProcAddress--throwIfNull :: String -> IO (FunPtr a) -> IO (FunPtr a)-throwIfNull msg act = do-   res <- act-   if res == nullFunPtr-      then ioError (userError msg)-      else return res--foreign import ccall unsafe "hs_OpenGL_getProcAddress" hs_OpenGL_getProcAddress-   :: CString -> IO (FunPtr a)

@@ -17,7 +17,7 @@    Face(..), marshalFace, unmarshalFace ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -29,13 +29,13 @@  marshalFace :: Face -> GLenum marshalFace x = case x of-   Front -> 0x404-   Back -> 0x405-   FrontAndBack -> 0x408+   Front -> gl_FRONT+   Back -> gl_BACK+   FrontAndBack -> gl_FRONT_AND_BACK  unmarshalFace :: GLenum -> Face unmarshalFace x-   | x == 0x404 = Front-   | x == 0x405 = Back-   | x == 0x408 = FrontAndBack+   | x == gl_FRONT = Front+   | x == gl_BACK = Back+   | x == gl_FRONT_AND_BACK = FrontAndBack    | otherwise = error ("unmarshalFace: illegal value " ++ show x)

@@ -17,20 +17,22 @@    getFeedbackTokens, PassThroughValue(..), passThrough ) where -import Control.Monad ( liftM2, liftM3, liftM4 )-import Foreign.Marshal.Array ( allocaArray )-import Foreign.Ptr ( Ptr, plusPtr )-import Foreign.Storable ( Storable(sizeOf) )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLenum, GLint, GLsizei, GLfloat )-import Graphics.Rendering.OpenGL.GL.IOState (-   IOState, getIOState, peekIOState, evalIOState, nTimes )-import Graphics.Rendering.OpenGL.GL.RenderMode ( withRenderMode )-import Graphics.Rendering.OpenGL.GL.Selection ( RenderMode(Feedback) )-import Graphics.Rendering.OpenGL.GL.StateVar ( HasGetter(get) )-import Graphics.Rendering.OpenGL.GL.VertexSpec (-   Vertex2(..), Vertex3(..), Vertex4(..), Index1(..), Color4(..),-   TexCoord4(..), rgbaMode )+import Control.Monad+import Data.StateVar+import Data.Tensor+import Foreign.Marshal.Array+import Foreign.Ptr+import Foreign.Storable+import Graphics.Rendering.OpenGL.GL.IOState+import Graphics.Rendering.OpenGL.GL.RenderMode+import Graphics.Rendering.OpenGL.GL.Selection+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glFeedbackBuffer, glPassThrough, gl_2D, gl_3D, gl_3D_COLOR,+   gl_3D_COLOR_TEXTURE, gl_4D_COLOR_TEXTURE, gl_BITMAP_TOKEN,+   gl_COPY_PIXEL_TOKEN, gl_DRAW_PIXEL_TOKEN, gl_LINE_RESET_TOKEN, gl_LINE_TOKEN,+   gl_PASS_THROUGH_TOKEN, gl_POINT_TOKEN, gl_POLYGON_TOKEN )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -69,14 +71,14 @@  unmarshalFeedbackTag :: GLenum -> FeedbackTag unmarshalFeedbackTag x-   | x == 0x701 = PointTag-   | x == 0x702 = LineTag-   | x == 0x707 = LineResetTag-   | x == 0x703 = PolygonTag-   | x == 0x704 = BitmapTag-   | x == 0x705 = DrawPixelTag-   | x == 0x706 = CopyPixelTag-   | x == 0x700 = PassThroughTag+   | x == gl_POINT_TOKEN = PointTag+   | x == gl_LINE_TOKEN = LineTag+   | x == gl_LINE_RESET_TOKEN = LineResetTag+   | x == gl_POLYGON_TOKEN = PolygonTag+   | x == gl_BITMAP_TOKEN = BitmapTag+   | x == gl_DRAW_PIXEL_TOKEN = DrawPixelTag+   | x == gl_COPY_PIXEL_TOKEN = CopyPixelTag+   | x == gl_PASS_THROUGH_TOKEN = PassThroughTag    | otherwise = error ("unmarshalFeedbackTag: illegal value " ++ show x)  --------------------------------------------------------------------------------@@ -91,11 +93,11 @@  marshalFeedbackType :: FeedbackType -> GLenum marshalFeedbackType x = case x of-   TwoD -> 0x600-   ThreeD -> 0x601-   ThreeDColor -> 0x602-   ThreeDColorTexture -> 0x603-   FourDColorTexture -> 0x604+   TwoD -> gl_2D+   ThreeD -> gl_3D+   ThreeDColor -> gl_3D_COLOR+   ThreeDColorTexture -> gl_3D_COLOR_TEXTURE+   FourDColorTexture -> gl_4D_COLOR_TEXTURE  -------------------------------------------------------------------------------- @@ -108,9 +110,6 @@       tokens <- parseFeedbackBuffer numValues buf feedbackType       return (value, tokens) -foreign import CALLCONV unsafe "glFeedbackBuffer" glFeedbackBuffer ::-   GLsizei -> GLenum -> Ptr GLfloat -> IO ()- --------------------------------------------------------------------------------  parseFeedbackBuffer ::@@ -199,5 +198,5 @@ newtype PassThroughValue = PassThroughValue GLfloat    deriving ( Eq, Ord, Show ) -foreign import CALLCONV unsafe "glPassThrough" passThrough ::-   PassThroughValue -> IO ()+passThrough :: PassThroughValue -> IO ()+passThrough (PassThroughValue ptv) = glPassThrough ptv

@@ -17,6 +17,8 @@    flush, finish       ) where +import Graphics.Rendering.OpenGL.Raw.Core31+ --------------------------------------------------------------------------------  -- | Different GL implementations buffer commands in several different@@ -35,7 +37,8 @@ -- Note that 'flush' can return at any time. It does not wait until the -- execution of all previously issued GL commands is complete. -foreign import CALLCONV unsafe "glFlush" flush :: IO ()+flush :: IO ()+flush = glFlush  -- | 'finish' does not return until the effects of all previously called GL -- commands are complete. Such effects include all changes to GL state, all@@ -43,4 +46,5 @@ --  -- Note that 'finish' requires a round trip to the server. -foreign import CALLCONV unsafe "glFinish" finish :: IO ()+finish :: IO ()+finish = glFinish

@@ -20,19 +20,17 @@    FogDistanceMode(..), fogDistanceMode ) where -import Foreign.Marshal.Utils ( with )-import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapFog), makeCapability )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLenum, GLint, GLfloat, Capability )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetFogIndex,GetFogDensity,GetFogStart,GetFogEnd,GetFogMode,-   GetFogColor,GetFogCoordSrc,GetFogDistanceMode),-   getInteger1, getFloat1, getFloat4 )-import Graphics.Rendering.OpenGL.GL.StateVar ( StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GL.VertexSpec (-   Color4(Color4), Index1(Index1) )+import Data.StateVar+import Foreign.Marshal.Utils+import Foreign.Ptr+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glFogf, glFogfv, glFogi, gl_EXP, gl_EXP2, gl_EYE_PLANE, gl_FOG_COLOR,+   gl_FOG_COORD, gl_FOG_COORD_SRC, gl_FOG_DENSITY, gl_FOG_END, gl_FOG_INDEX,+   gl_FOG_MODE, gl_FOG_START, gl_FRAGMENT_DEPTH )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -53,13 +51,14 @@  marshalFogParameter :: FogParameter -> GLenum marshalFogParameter x = case x of-   FogIndex -> 0xb61-   FogDensity -> 0xb62-   FogStart -> 0xb63-   FogEnd -> 0xb64-   FogMode -> 0xb65-   FogColor -> 0xb66-   FogCoordSrc -> 0x8450+   FogIndex -> gl_FOG_INDEX+   FogDensity -> gl_FOG_DENSITY+   FogStart -> gl_FOG_START+   FogEnd -> gl_FOG_END+   FogMode -> gl_FOG_MODE+   FogColor -> gl_FOG_COLOR+   FogCoordSrc -> gl_FOG_COORD_SRC+   -- TODO: Use FOG_DISTANCE_MODE_NV from NV_fog_distance extension    FogDistanceMode -> 0x855a  --------------------------------------------------------------------------------@@ -70,17 +69,18 @@    | Exp2'  marshalFogMode' :: FogMode' -> GLint-marshalFogMode' x = case x of-   Linear' -> 0x2601-   Exp' -> 0x800-   Exp2' -> 0x801+marshalFogMode' x = fromIntegral $ case x of+   Linear' -> gl_LINEAR+   Exp' -> gl_EXP+   Exp2' -> gl_EXP2  unmarshalFogMode' :: GLint -> FogMode' unmarshalFogMode' x-   | x == 0x2601 = Linear'-   | x == 0x800 = Exp'-   | x == 0x801 = Exp2'+   | y == gl_LINEAR = Linear'+   | y == gl_EXP = Exp'+   | y == gl_EXP2 = Exp2'    | otherwise = error ("unmarshalFogMode': illegal value " ++ show x)+   where y = fromIntegral x  -------------------------------------------------------------------------------- @@ -123,18 +123,11 @@ fogi :: FogParameter -> GLint -> IO () fogi = glFogi . marshalFogParameter -foreign import CALLCONV unsafe "glFogi" glFogi :: GLenum -> GLint -> IO ()- fogf :: FogParameter -> GLfloat -> IO () fogf = glFogf . marshalFogParameter -foreign import CALLCONV unsafe "glFogf" glFogf :: GLenum -> GLfloat -> IO ()- fogfv :: FogParameter -> Ptr (Color4 GLfloat) -> IO ()-fogfv = glFogfv . marshalFogParameter--foreign import CALLCONV unsafe "glFogfv" glFogfv ::-   GLenum -> Ptr (Color4 GLfloat) -> IO ()+fogfv param ptr = glFogfv (marshalFogParameter param) (castPtr ptr)  -------------------------------------------------------------------------------- @@ -158,15 +151,16 @@    deriving ( Eq, Ord, Show )  marshalFogCoordSrc :: FogCoordSrc -> GLint-marshalFogCoordSrc x = case x of-   FogCoord -> 0x8451-   FragmentDepth -> 0x8452+marshalFogCoordSrc x = fromIntegral $ case x of+   FogCoord -> gl_FOG_COORD+   FragmentDepth -> gl_FRAGMENT_DEPTH  unmarshalFogCoordSrc :: GLint -> FogCoordSrc unmarshalFogCoordSrc x-   | x == 0x8451 = FogCoord-   | x == 0x8452 = FragmentDepth+   | y == gl_FOG_COORD = FogCoord+   | y == gl_FRAGMENT_DEPTH = FragmentDepth    | otherwise = error ("unmarshalFogCoordSrc: illegal value " ++ show x)+   where y = fromIntegral x  -------------------------------------------------------------------------------- @@ -185,17 +179,22 @@    deriving ( Eq, Ord, Show )  marshalFogDistanceMode :: FogDistanceMode -> GLint-marshalFogDistanceMode x = case x of+marshalFogDistanceMode x = fromIntegral $ case x of+   -- TODO: Use EYE_RADIAL_NV from NV_fog_distance extension    EyeRadial -> 0x855b-   EyePlaneSigned -> 0x2502+   EyePlaneSigned ->gl_EYE_PLANE+   -- TODO: Use EYE_PLANE_ABSOLUTE_NV from NV_fog_distance extension    EyePlaneAbsolute -> 0x855c  unmarshalFogDistanceMode :: GLint -> FogDistanceMode unmarshalFogDistanceMode x-   | x== 0x855b = EyeRadial-   | x == 0x2502 = EyePlaneSigned-   | x == 0x855c = EyePlaneAbsolute+   -- TODO: Use EYE_RADIAL_NV from NV_fog_distance extension+   | y == 0x855b = EyeRadial+   | y == gl_EYE_PLANE = EyePlaneSigned+   -- TODO: Use EYE_PLANE_ABSOLUTE_NV from NV_fog_distance extension+   | y == 0x855c = EyePlaneAbsolute    | otherwise = error ("unmarshalFogDistanceMode: illegal value " ++ show x)+   where y = fromIntegral x  -------------------------------------------------------------------------------- 

@@ -32,50 +32,22 @@    AccumOp(..), accum ) where -import Control.Monad ( liftM4 )-import Data.List ( genericLength )-import Data.Maybe ( isJust, fromJust )-import Foreign.Marshal.Array ( withArray )-import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.BufferMode (-   BufferMode(..), marshalBufferMode, unmarshalBufferMode )-import Graphics.Rendering.OpenGL.GL.Capability (-   marshalCapability, unmarshalCapability )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLboolean, GLenum, GLsizei, GLint, GLuint, GLbitfield, GLfloat, GLclampf,-   GLclampd,-#ifdef __HADDOCK__-   Capability(..)-#else-   Capability-#endif-   )-import Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO, Invoker, getProcAddress )-import Graphics.Rendering.OpenGL.GL.Face ( Face, marshalFace )-import Graphics.Rendering.OpenGL.GL.GLboolean ( unmarshalGLboolean )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetAuxBuffers,GetDoublebuffer,GetStereo,GetRedBits,GetGreenBits,-            GetBlueBits,GetAlphaBits,GetStencilBits,GetDepthBits,-            GetAccumRedBits,GetAccumGreenBits,GetAccumBlueBits,-            GetAccumAlphaBits,GetRGBASignedComponents,GetDrawBuffer,-            GetIndexWritemask,GetColorWritemask,GetDepthWritemask,-            GetStencilWritemask,GetColorClearValue,GetIndexClearValue,-            GetDepthClearValue,GetStencilClearValue,GetAccumClearValue,-            GetMaxDrawBuffers,GetDrawBufferN),-   getInteger1, getInteger4, getBoolean1, getBoolean4, getEnum1, getSizei1,-   getFloat1, getFloat4, getDouble1 )-import Graphics.Rendering.OpenGL.GL.StateVar (-   HasGetter(get), GettableStateVar, makeGettableStateVar,-   SettableStateVar, makeSettableStateVar,-   StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GL.VertexSpec (-   Color4(Color4), Index1(Index1) )-import Graphics.Rendering.OpenGL.GLU.ErrorsInternal ( recordInvalidValue )------------------------------------------------------------------------------------#include "HsOpenGLExt.h"+import Control.Monad+import Data.List+import Data.Maybe+import Data.StateVar+import Foreign.Marshal.Array+import Graphics.Rendering.OpenGL.GL.BufferMode+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.Face+import Graphics.Rendering.OpenGL.GL.GLboolean+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.GLU.ErrorsInternal+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glAccum, glClearAccum, glClearIndex, glIndexMask, gl_ACCUM,+   gl_ACCUM_BUFFER_BIT, gl_ADD, gl_LOAD, gl_MULT, gl_RETURN )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -150,9 +122,6 @@       (getEnum1 unmarshalBufferMode GetDrawBuffer)       (maybe recordInvalidValue glDrawBuffer . marshalBufferMode) -foreign import CALLCONV unsafe "glDrawBuffer" glDrawBuffer ::-   GLenum -> IO ()- --------------------------------------------------------------------------------  -- | 'drawBuffers' defines the draw buffers to which all fragment colors are@@ -192,8 +161,6 @@               glDrawBuffers (genericLength ms)       else recordInvalidValue -EXTENSION_ENTRY("GL_ARB_draw_buffers or OpenGL 2.0",glDrawBuffers,GLsizei -> Ptr GLenum -> IO ())- --------------------------------------------------------------------------------  -- | Contains the maximum number of buffers that can activated via 'drawBuffers'@@ -221,8 +188,6 @@ indexMask =    makeStateVar (getInteger1 fromIntegral GetIndexWritemask) glIndexMask -foreign import CALLCONV unsafe "glIndexMask" glIndexMask :: GLuint -> IO ()- --------------------------------------------------------------------------------  -- | Controls whether the individual color components in the framebuffer can or@@ -248,9 +213,6 @@                                         (marshalCapability b)                                         (marshalCapability a)) -foreign import CALLCONV unsafe "glColorMask" glColorMask ::-   GLboolean -> GLboolean -> GLboolean -> GLboolean -> IO ()- --------------------------------------------------------------------------------  -- | Controls whether the depth buffer is enabled for writing. The initial state@@ -260,8 +222,6 @@ depthMask = makeStateVar (getBoolean1 unmarshalCapability GetDepthWritemask)                          (glDepthMask . marshalCapability) -foreign import CALLCONV unsafe "glDepthMask" glDepthMask :: GLboolean -> IO ()- --------------------------------------------------------------------------------  -- | Controls the writing of individual bits in the stencil planes. The least@@ -275,15 +235,11 @@ stencilMask =    makeStateVar (getInteger1 fromIntegral GetStencilWritemask) glStencilMask -foreign import CALLCONV unsafe "glStencilMask" glStencilMask :: GLuint -> IO ()- stencilMaskSeparate :: Face -> SettableStateVar GLuint stencilMaskSeparate face =    makeSettableStateVar $       glStencilMaskSeparate (marshalFace face) -EXTENSION_ENTRY("OpenGL 2.0",glStencilMaskSeparate,GLenum -> GLuint -> IO ())- --------------------------------------------------------------------------------  -- | The buffers which can be cleared with 'clear'.@@ -297,10 +253,10 @@  marshalClearBuffer :: ClearBuffer -> GLbitfield marshalClearBuffer x = case x of-   ColorBuffer -> 0x4000-   AccumBuffer -> 0x200-   StencilBuffer -> 0x400-   DepthBuffer -> 0x100+   ColorBuffer -> gl_COLOR_BUFFER_BIT+   AccumBuffer -> gl_ACCUM_BUFFER_BIT+   StencilBuffer -> gl_STENCIL_BUFFER_BIT+   DepthBuffer -> gl_DEPTH_BUFFER_BIT  -------------------------------------------------------------------------------- @@ -324,8 +280,6 @@ clear :: [ClearBuffer] -> IO () clear = glClear . sum . map marshalClearBuffer -foreign import CALLCONV unsafe "glClear" glClear :: GLbitfield -> IO ()- --------------------------------------------------------------------------------  -- | Controls the red, green, blue, and alpha values used by 'clear' to clear@@ -336,9 +290,6 @@ clearColor = makeStateVar (getFloat4 Color4 GetColorClearValue)                           (\(Color4 r g b a) -> glClearColor r g b a) -foreign import CALLCONV unsafe "glClearColor" glClearColor ::-    GLclampf -> GLclampf -> GLclampf -> GLclampf -> IO ()- --------------------------------------------------------------------------------  -- | Controls the index /c/ used by 'clear' to clear the color index buffers.@@ -351,8 +302,6 @@ clearIndex = makeStateVar (getFloat1 Index1 GetIndexClearValue)                           (\(Index1 i) -> glClearIndex i) -foreign import CALLCONV unsafe "glClearIndex" glClearIndex :: GLfloat -> IO ()- --------------------------------------------------------------------------------  -- | Controls the depth value used by 'clear' to clear the depth buffer. Values@@ -362,8 +311,6 @@ clearDepth :: StateVar GLclampd clearDepth = makeStateVar (getDouble1 id GetDepthClearValue) glClearDepth -foreign import CALLCONV unsafe "glClearDepth" glClearDepth :: GLclampd -> IO ()- --------------------------------------------------------------------------------  -- | Controls the value /s/ used by 'clear' to clear the stencil buffer. /s/ is@@ -373,8 +320,6 @@ clearStencil :: StateVar GLint clearStencil = makeStateVar (getInteger1 id GetStencilClearValue) glClearStencil -foreign import CALLCONV unsafe "glClearStencil" glClearStencil :: GLint -> IO ()- --------------------------------------------------------------------------------  -- | Controls the red, green, blue, and alpha values used by 'clear' to clear@@ -386,9 +331,6 @@    makeStateVar (getFloat4 Color4 GetAccumClearValue)                 (\(Color4 r g b a) -> glClearAccum r g b a) -foreign import CALLCONV unsafe "glClearAccum" glClearAccum ::-   GLfloat -> GLfloat -> GLfloat -> GLfloat -> IO ()- --------------------------------------------------------------------------------  -- | An operation on the accumulation buffer.@@ -430,11 +372,11 @@  marshalAccumOp :: AccumOp -> GLenum marshalAccumOp x = case x of-   Accum -> 0x100-   Load -> 0x101-   Return -> 0x102-   Mult -> 0x103-   Add -> 0x104+   Accum -> gl_ACCUM+   Load -> gl_LOAD+   Return -> gl_RETURN+   Mult -> gl_MULT+   Add -> gl_ADD  -------------------------------------------------------------------------------- @@ -466,5 +408,3 @@  accum :: AccumOp -> GLfloat -> IO () accum = glAccum . marshalAccumOp--foreign import CALLCONV unsafe "glAccum" glAccum :: GLenum -> GLfloat -> IO ()

@@ -17,11 +17,14 @@    marshalGLboolean, unmarshalGLboolean ) where +import Graphics.Rendering.OpenGL.Raw.Core31+ --------------------------------------------------------------------------------  marshalGLboolean :: Num a => Bool -> a-marshalGLboolean False = 0-marshalGLboolean True  = 1+marshalGLboolean x = fromIntegral $ case x of+   False -> gl_FALSE+   True -> gl_TRUE -unmarshalGLboolean :: (Eq a, Num a) => a -> Bool-unmarshalGLboolean = (/= 0)+unmarshalGLboolean :: Num a => a -> Bool+unmarshalGLboolean = (/= fromIntegral gl_FALSE)

@@ -16,13 +16,14 @@    HintTarget(..), HintMode(..), hint ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetPerspectiveCorrectionHint,GetPointSmoothHint,GetLineSmoothHint,-            GetPolygonSmoothHint,GetFogHint,GetGenerateMipmapHint,-            GetTextureCompressionHint,GetPackCMYKHint,GetUnpackCMYKHint),-   getEnum1 )-import Graphics.Rendering.OpenGL.GL.StateVar ( StateVar, makeStateVar )+import Data.StateVar+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   gl_FOG_HINT, gl_GENERATE_MIPMAP_HINT, gl_PERSPECTIVE_CORRECTION_HINT,+   gl_POINT_SMOOTH_HINT )+import Graphics.Rendering.OpenGL.Raw.Core31+import Graphics.Rendering.OpenGL.Raw.EXT.Cmyka (+   gl_PACK_CMYK_HINT, gl_UNPACK_CMYK_HINT )  -------------------------------------------------------------------------------- @@ -40,15 +41,15 @@  marshalHintTarget :: HintTarget -> GLenum marshalHintTarget x = case x of-   PerspectiveCorrection -> 0xc50-   PointSmooth -> 0xc51-   LineSmooth -> 0xc52-   PolygonSmooth -> 0xc53-   Fog -> 0xc54-   GenerateMipmap -> 0x8192-   TextureCompression -> 0x84ef-   PackCMYK -> 0x800e-   UnpackCMYK -> 0x800f+   PerspectiveCorrection -> gl_PERSPECTIVE_CORRECTION_HINT+   PointSmooth -> gl_POINT_SMOOTH_HINT+   LineSmooth -> gl_LINE_SMOOTH_HINT+   PolygonSmooth -> gl_POLYGON_SMOOTH_HINT+   Fog -> gl_FOG_HINT+   GenerateMipmap -> gl_GENERATE_MIPMAP_HINT+   TextureCompression -> gl_TEXTURE_COMPRESSION_HINT+   PackCMYK -> gl_PACK_CMYK_HINT+   UnpackCMYK -> gl_UNPACK_CMYK_HINT  hintTargetToGetPName :: HintTarget -> GetPName hintTargetToGetPName x = case x of@@ -72,15 +73,15 @@  marshalHintMode :: HintMode -> GLenum marshalHintMode x = case x of-   DontCare -> 0x1100-   Fastest -> 0x1101-   Nicest -> 0x1102+   DontCare -> gl_DONT_CARE+   Fastest -> gl_FASTEST+   Nicest -> gl_NICEST  unmarshalHintMode :: GLenum -> HintMode unmarshalHintMode x-   | x == 0x1100 = DontCare-   | x == 0x1101 = Fastest-   | x == 0x1102 = Nicest+   | x == gl_DONT_CARE = DontCare+   | x == gl_FASTEST = Fastest+   | x == gl_NICEST = Nicest    | otherwise = error ("unmarshalHintMode: illegal value " ++ show x)  --------------------------------------------------------------------------------@@ -90,5 +91,3 @@    makeStateVar       (getEnum1 unmarshalHintMode (hintTargetToGetPName t))       (glHint (marshalHintTarget t) . marshalHintMode)--foreign import CALLCONV unsafe "glHint" glHint :: GLenum -> GLenum -> IO ()

@@ -27,18 +27,12 @@    aliasedLineWidthRange, smoothLineWidthRange, smoothLineWidthGranularity ) where -import Control.Monad ( liftM2 )-import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapLineSmooth,CapLineStipple), makeCapability, makeStateVarMaybe )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLint, GLushort, GLfloat, Capability )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetLineWidth,GetAliasedLineWidthRange,GetSmoothLineWidthRange,-            GetSmoothLineWidthGranularity,GetLineStippleRepeat,-            GetLineStipplePattern),-   getInteger1, getFloat1, getFloat2 )-import Graphics.Rendering.OpenGL.GL.StateVar (-   GettableStateVar, makeGettableStateVar, StateVar, makeStateVar )+import Control.Monad+import Data.StateVar+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility ( glLineStipple )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -88,8 +82,6 @@ lineWidth :: StateVar GLfloat lineWidth = makeStateVar (getFloat1 id GetLineWidth) glLineWidth -foreign import CALLCONV unsafe "glLineWidth" glLineWidth :: GLfloat -> IO ()- --------------------------------------------------------------------------------  -- | Line stippling masks out certain fragments produced by rasterization; those@@ -129,13 +121,10 @@                   (getInteger1 fromIntegral GetLineStipplePattern))       (uncurry glLineStipple) -foreign import CALLCONV unsafe "glLineStipple" glLineStipple ::-   GLint -> GLushort -> IO ()- --------------------------------------------------------------------------------  -- | Controls whether line antialiasing is enabled. The initial state is--- 'Graphics.Rendering.OpenGL.GL.BasicTypes.Disabled'.+-- 'Graphics.Rendering.OpenGL.GL.Capability.Disabled'.  lineSmooth :: StateVar Capability lineSmooth = makeCapability CapLineSmooth

@@ -19,8 +19,8 @@    peek1M, peek2M, peek3M, peek4M ) where -import Foreign.Ptr ( Ptr )-import Foreign.Storable ( Storable(peekElemOff,pokeElemOff) )+import Foreign.Ptr+import Foreign.Storable  -------------------------------------------------------------------------------- -- The implementation is little bit verbose/redundant, but seems to generate

@@ -50,52 +50,26 @@    LogicOp(..), logicOp ) where -import Control.Monad ( liftM2, liftM3 )-import Foreign.Marshal.Alloc ( alloca )-import Foreign.Marshal.Array ( withArrayLen, peekArray, allocaArray )-import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.BufferObjects ( ObjectName(..) )-import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapScissorTest,CapSampleAlphaToCoverage,CapSampleAlphaToOne,-             CapSampleCoverage,CapDepthBoundsTest,CapAlphaTest,CapStencilTest,-             CapStencilTestTwoSide,CapDepthTest,CapBlend,CapDither,-             CapIndexLogicOp,CapColorLogicOp),-   makeCapability, makeStateVarMaybe )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLboolean, GLint, GLuint, GLsizei, GLenum, GLclampf, GLclampd, Capability )-import Graphics.Rendering.OpenGL.GL.BlendingFactor (-   BlendingFactor(..), marshalBlendingFactor, unmarshalBlendingFactor )-import Graphics.Rendering.OpenGL.GL.ComparisonFunction ( ComparisonFunction(..),-   marshalComparisonFunction, unmarshalComparisonFunction )-import Graphics.Rendering.OpenGL.GL.CoordTrans ( Position(..), Size(..) )-import Graphics.Rendering.OpenGL.GL.Exception ( bracket_ )-import Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO, Invoker, getProcAddress )-import Graphics.Rendering.OpenGL.GL.Face ( marshalFace, unmarshalFace )-import Graphics.Rendering.OpenGL.GL.Colors ( Face )-import Graphics.Rendering.OpenGL.GL.GLboolean (-   marshalGLboolean, unmarshalGLboolean )-import Graphics.Rendering.OpenGL.GL.PeekPoke ( peek1 )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetScissorBox,GetSampleCoverageValue,GetSampleCoverageInvert,-            GetDepthBounds,GetAlphaTestFunc,GetAlphaTestRef,GetStencilFunc,-            GetStencilRef,GetStencilValueMask,GetStencilFail,-            GetStencilPassDepthFail,GetStencilPassDepthPass,-            GetActiveStencilFace,GetDepthFunc,GetBlendEquation,-            GetBlendEquationAlpha,GetBlendDstRGB,GetBlendSrcRGB,-            GetBlendDstAlpha,GetBlendSrcAlpha,GetBlendSrc,GetBlendDst,-            GetBlendColor,GetLogicOpMode),-   getInteger1, getInteger4, getEnum1, getFloat1, getFloat4, getDouble2,-   getBoolean1 )-import Graphics.Rendering.OpenGL.GL.StateVar (-   HasGetter(get), GettableStateVar, makeGettableStateVar,-   SettableStateVar, makeSettableStateVar,-   StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GL.VertexSpec ( Color4(..), rgbaMode )------------------------------------------------------------------------------------#include "HsOpenGLExt.h"+import Control.Monad+import Data.ObjectName+import Data.StateVar+import Foreign.Marshal.Alloc+import Foreign.Marshal.Array+import Graphics.Rendering.OpenGL.GL.BlendingFactor+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.ComparisonFunction+import Graphics.Rendering.OpenGL.GL.CoordTrans+import Graphics.Rendering.OpenGL.GL.Exception+import Graphics.Rendering.OpenGL.GL.Face+import Graphics.Rendering.OpenGL.GL.GLboolean+import Graphics.Rendering.OpenGL.GL.PeekPoke+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glAlphaFunc, gl_INDEX_LOGIC_OP )+import Graphics.Rendering.OpenGL.Raw.Core31+import Graphics.Rendering.OpenGL.Raw.EXT.DepthBoundsTest ( glDepthBounds )+import Graphics.Rendering.OpenGL.Raw.EXT.StencilTwoSide ( glActiveStencilFace )  -------------------------------------------------------------------------------- @@ -106,9 +80,6 @@       (getInteger4 makeSB GetScissorBox)       (\(Position x y, Size w h) -> glScissor x y w h)    where makeSB x y w h = (Position x y, Size (fromIntegral w) (fromIntegral h))-       -foreign import CALLCONV unsafe "glScissor" glScissor ::-   GLint -> GLint -> GLsizei -> GLsizei -> IO ()  -------------------------------------------------------------------------------- @@ -124,9 +95,7 @@       (return CapSampleCoverage)       (liftM2 (,) (getFloat1 id GetSampleCoverageValue)                   (getBoolean1 unmarshalGLboolean GetSampleCoverageInvert))-      (\(value, invert) -> glSampleCoverageARB value (marshalGLboolean invert))--EXTENSION_ENTRY("GL_ARB_multisample or OpenGL 1.3",glSampleCoverageARB,GLclampf -> GLboolean -> IO ())+      (\(value, invert) -> glSampleCoverage value (marshalGLboolean invert))  -------------------------------------------------------------------------------- @@ -135,9 +104,7 @@    makeStateVarMaybe       (return CapDepthBoundsTest)       (getDouble2 (,) GetDepthBounds)-      (uncurry glDepthBoundsEXT)-       -EXTENSION_ENTRY("GL_EXT_depth_bounds_test",glDepthBoundsEXT,GLclampd -> GLclampd -> IO ())+      (uncurry glDepthBounds)  -------------------------------------------------------------------------------- @@ -149,9 +116,6 @@                   (getFloat1 id GetAlphaTestRef))       (uncurry (glAlphaFunc . marshalComparisonFunction)) -foreign import CALLCONV unsafe "glAlphaFunc" glAlphaFunc ::-   GLenum -> GLclampf -> IO ()- --------------------------------------------------------------------------------  stencilTest :: StateVar Capability@@ -168,16 +132,11 @@       (\(func, ref, mask) ->          glStencilFunc (marshalComparisonFunction func) ref mask) -foreign import CALLCONV unsafe "glStencilFunc" glStencilFunc ::-   GLenum -> GLint -> GLuint -> IO ()- stencilFuncSeparate :: Face -> SettableStateVar (ComparisonFunction, GLint, GLuint) stencilFuncSeparate face =    makeSettableStateVar $ \(func, ref, mask) ->       glStencilFuncSeparate (marshalFace face) (marshalComparisonFunction func) ref mask -EXTENSION_ENTRY("OpenGL 2.0",glStencilFuncSeparate,GLenum -> GLenum -> GLint -> GLuint -> IO ())- --------------------------------------------------------------------------------  data StencilOp =@@ -193,25 +152,25 @@  marshalStencilOp :: StencilOp -> GLenum marshalStencilOp x = case x of-   OpZero -> 0x0-   OpKeep -> 0x1e00-   OpReplace -> 0x1e01-   OpIncr -> 0x1e02-   OpIncrWrap -> 0x8507-   OpDecr -> 0x1e03-   OpDecrWrap -> 0x8508-   OpInvert -> 0x150a+   OpZero -> gl_ZERO+   OpKeep -> gl_KEEP+   OpReplace -> gl_REPLACE+   OpIncr -> gl_INCR+   OpIncrWrap -> gl_INCR_WRAP+   OpDecr -> gl_DECR+   OpDecrWrap -> gl_DECR_WRAP+   OpInvert -> gl_INVERT  unmarshalStencilOp :: GLenum -> StencilOp unmarshalStencilOp x-   | x == 0x0 = OpZero-   | x == 0x1e00 = OpKeep-   | x == 0x1e01 = OpReplace-   | x == 0x1e02 = OpIncr-   | x == 0x8507 = OpIncrWrap-   | x == 0x1e03 = OpDecr-   | x == 0x8508 = OpDecrWrap-   | x == 0x150a = OpInvert+   | x == gl_ZERO = OpZero+   | x == gl_KEEP = OpKeep+   | x == gl_REPLACE = OpReplace+   | x == gl_INCR = OpIncr+   | x == gl_INCR_WRAP = OpIncrWrap+   | x == gl_DECR = OpDecr+   | x == gl_DECR_WRAP = OpDecrWrap+   | x == gl_INVERT = OpInvert    | otherwise = error ("unmarshalStencilOp: illegal value " ++ show x)  --------------------------------------------------------------------------------@@ -226,9 +185,6 @@                                         (marshalStencilOp spdf)                                         (marshalStencilOp spdp)) -foreign import CALLCONV unsafe "glStencilOp" glStencilOp ::-   GLenum -> GLenum -> GLenum -> IO ()- stencilOpSeparate :: Face -> SettableStateVar (StencilOp, StencilOp, StencilOp) stencilOpSeparate face =    makeSettableStateVar $ \(sf, spdf, spdp) ->@@ -237,8 +193,6 @@                           (marshalStencilOp spdf)                           (marshalStencilOp spdp) -EXTENSION_ENTRY("OpenGL 2.0",glStencilOpSeparate,GLenum -> GLenum -> GLenum -> GLenum -> IO ())- --------------------------------------------------------------------------------  activeStencilFace :: StateVar (Maybe Face)@@ -246,9 +200,7 @@    makeStateVarMaybe       (return CapStencilTestTwoSide)       (getEnum1 unmarshalFace GetActiveStencilFace)-      (glActiveStencilFaceEXT . marshalFace)--EXTENSION_ENTRY("GL_EXT_stencil_two_side",glActiveStencilFaceEXT,GLenum -> IO ())+      (glActiveStencilFace . marshalFace)  -------------------------------------------------------------------------------- @@ -259,8 +211,6 @@       (getEnum1 unmarshalComparisonFunction GetDepthFunc)       (glDepthFunc . marshalComparisonFunction) -foreign import CALLCONV unsafe "glDepthFunc" glDepthFunc :: GLenum -> IO ()- --------------------------------------------------------------------------------  newtype QueryObject = QueryObject { queryID :: GLuint }@@ -271,21 +221,14 @@ instance ObjectName QueryObject where    genObjectNames n =       allocaArray n $ \buf -> do-        glGenQueriesARB (fromIntegral n) buf+        glGenQueries (fromIntegral n) buf         fmap (map QueryObject) $ peekArray n buf     deleteObjectNames queryObjects =       withArrayLen (map queryID queryObjects) $-         glDeleteQueriesARB . fromIntegral--   isObjectName = fmap unmarshalGLboolean . glIsQueryARB . queryID---EXTENSION_ENTRY("GL_ARB_occlusion_query or OpenGL 1.5",glGenQueriesARB,GLsizei -> Ptr GLuint -> IO ())--EXTENSION_ENTRY("GL_ARB_occlusion_query or OpenGL 1.5",glDeleteQueriesARB,GLsizei -> Ptr GLuint -> IO ())+         glDeleteQueries . fromIntegral -EXTENSION_ENTRY("GL_ARB_occlusion_query or OpenGL 1.5",glIsQueryARB,GLuint -> IO GLboolean)+   isObjectName = fmap unmarshalGLboolean . glIsQuery . queryID  -------------------------------------------------------------------------------- @@ -295,19 +238,15 @@  marshalQueryTarget :: QueryTarget -> GLenum marshalQueryTarget x = case x of-   SamplesPassed -> 0x8914+   SamplesPassed -> gl_SAMPLES_PASSED  --------------------------------------------------------------------------------  beginQuery :: QueryTarget -> QueryObject -> IO ()-beginQuery t = glBeginQueryARB (marshalQueryTarget t) . queryID--EXTENSION_ENTRY("GL_ARB_occlusion_query or OpenGL 1.5",glBeginQueryARB,GLenum -> GLuint -> IO ())+beginQuery t = glBeginQuery (marshalQueryTarget t) . queryID  endQuery :: QueryTarget -> IO ()-endQuery = glEndQueryARB . marshalQueryTarget--EXTENSION_ENTRY("GL_ARB_occlusion_query or OpenGL 1.5",glEndQueryARB,GLenum -> IO ())+endQuery = glEndQuery . marshalQueryTarget  -- | Convenience function for an exception-safe combination of 'beginQuery' and -- 'endQuery'.@@ -322,8 +261,8 @@  marshalGetQueryPName :: GetQueryPName -> GLenum marshalGetQueryPName x = case x of-   QueryCounterBits -> 0x8864-   CurrentQuery -> 0x8865+   QueryCounterBits -> gl_QUERY_COUNTER_BITS+   CurrentQuery -> gl_CURRENT_QUERY  -------------------------------------------------------------------------------- @@ -340,11 +279,9 @@ getQueryi f p t =    makeGettableStateVar $       alloca $ \buf -> do-         glGetQueryivARB (marshalQueryTarget t) (marshalGetQueryPName p) buf+         glGetQueryiv (marshalQueryTarget t) (marshalGetQueryPName p) buf          peek1 f buf -EXTENSION_ENTRY("GL_ARB_occlusion_query or OpenGL 1.5",glGetQueryivARB,GLenum -> GLenum -> Ptr GLint -> IO ())- --------------------------------------------------------------------------------  data GetQueryObjectPName =@@ -353,8 +290,8 @@  marshalGetQueryObjectPName :: GetQueryObjectPName -> GLenum marshalGetQueryObjectPName x = case x of-   QueryResult -> 0x8866-   QueryResultAvailable -> 0x8867+   QueryResult -> gl_QUERY_RESULT+   QueryResultAvailable -> gl_QUERY_RESULT_AVAILABLE  -------------------------------------------------------------------------------- @@ -369,11 +306,9 @@ getQueryObjectui f p q =    makeGettableStateVar $       alloca $ \buf -> do-         glGetQueryObjectuivARB (queryID q) (marshalGetQueryObjectPName p) buf+         glGetQueryObjectuiv (queryID q) (marshalGetQueryObjectPName p) buf          peek1 f buf -EXTENSION_ENTRY("GL_ARB_occlusion_query or OpenGL 1.5",glGetQueryObjectuivARB,GLuint -> GLenum -> Ptr GLuint -> IO ())- --------------------------------------------------------------------------------  blend :: StateVar Capability@@ -392,21 +327,21 @@  marshalBlendEquation :: BlendEquation -> GLenum marshalBlendEquation x = case x of-   FuncAdd -> 0x8006-   FuncSubtract -> 0x800a-   FuncReverseSubtract -> 0x800b-   Min -> 0x8007-   Max -> 0x8008-   LogicOp -> 0xbf1+   FuncAdd -> gl_FUNC_ADD+   FuncSubtract -> gl_FUNC_SUBTRACT+   FuncReverseSubtract -> gl_FUNC_REVERSE_SUBTRACT+   Min -> gl_MIN+   Max -> gl_MAX+   LogicOp -> gl_INDEX_LOGIC_OP  unmarshalBlendEquation :: GLenum -> BlendEquation unmarshalBlendEquation x-   | x == 0x8006 = FuncAdd-   | x == 0x800a = FuncSubtract-   | x == 0x800b = FuncReverseSubtract-   | x == 0x8007 = Min-   | x == 0x8008 = Max-   | x == 0xbf1 = LogicOp+   | x == gl_FUNC_ADD = FuncAdd+   | x == gl_FUNC_SUBTRACT = FuncSubtract+   | x == gl_FUNC_REVERSE_SUBTRACT = FuncReverseSubtract+   | x == gl_MIN = Min+   | x == gl_MAX = Max+   | x == gl_INDEX_LOGIC_OP = LogicOp    | otherwise = error ("unmarshalBlendEquation: illegal value " ++ show x)  --------------------------------------------------------------------------------@@ -415,9 +350,7 @@ blendEquation =    makeStateVar       (getEnum1 unmarshalBlendEquation GetBlendEquation)-      (glBlendEquationEXT . marshalBlendEquation)--EXTENSION_ENTRY("GL_EXT_blend_minmax or GL_EXT_blend_subtract or OpenGL 1.4",glBlendEquationEXT,GLenum -> IO ())+      (glBlendEquation . marshalBlendEquation)  blendEquationSeparate :: StateVar (BlendEquation,BlendEquation) blendEquationSeparate =@@ -428,8 +361,6 @@           glBlendEquationSeparate (marshalBlendEquation funcRGB)                                   (marshalBlendEquation funcAlpha)) -EXTENSION_ENTRY("GL_EXT_blend_equation_separate or OpenGL 2.0",glBlendEquationSeparate,GLenum -> GLenum -> IO ())- --------------------------------------------------------------------------------  blendFuncSeparate ::@@ -442,12 +373,10 @@           dstAlpha <- getEnum1 unmarshalBlendingFactor GetBlendDstAlpha           return ((srcRGB, srcAlpha), (dstRGB, dstAlpha)))       (\((srcRGB, srcAlpha), (dstRGB, dstAlpha)) ->-         glBlendFuncSeparateEXT (marshalBlendingFactor srcRGB)-                                (marshalBlendingFactor srcAlpha)-                                (marshalBlendingFactor dstRGB)-                                (marshalBlendingFactor dstAlpha))--EXTENSION_ENTRY("GL_EXT_blend_func_separate or OpenGL 1.4",glBlendFuncSeparateEXT,GLenum -> GLenum -> GLenum -> GLenum -> IO ())+         glBlendFuncSeparate (marshalBlendingFactor srcRGB)+                             (marshalBlendingFactor srcAlpha)+                             (marshalBlendingFactor dstRGB)+                             (marshalBlendingFactor dstAlpha))  blendFunc :: StateVar (BlendingFactor, BlendingFactor) blendFunc =@@ -457,16 +386,11 @@       (\(s, d) ->          glBlendFunc (marshalBlendingFactor s) (marshalBlendingFactor d)) -foreign import CALLCONV unsafe "glBlendFunc" glBlendFunc ::-   GLenum -> GLenum -> IO ()- blendColor :: StateVar (Color4 GLclampf) blendColor =    makeStateVar       (getFloat4 Color4 GetBlendColor)-      (\(Color4 r g b a) -> glBlendColorEXT r g b a)--EXTENSION_ENTRY("GL_EXT_blend_color or OpenGL 1.4",glBlendColorEXT,GLclampf -> GLclampf -> GLclampf -> GLclampf -> IO ())+      (\(Color4 r g b a) -> glBlendColor r g b a)  -------------------------------------------------------------------------------- @@ -496,41 +420,41 @@  marshalLogicOp :: LogicOp -> GLenum marshalLogicOp x = case x of-   Clear -> 0x1500-   And -> 0x1501-   AndReverse -> 0x1502-   Copy -> 0x1503-   AndInverted -> 0x1504-   Noop -> 0x1505-   Xor -> 0x1506-   Or -> 0x1507-   Nor -> 0x1508-   Equiv -> 0x1509-   Invert -> 0x150a-   OrReverse -> 0x150b-   CopyInverted -> 0x150c-   OrInverted -> 0x150d-   Nand -> 0x150e-   Set -> 0x150f+   Clear -> gl_CLEAR+   And -> gl_AND+   AndReverse -> gl_AND_REVERSE+   Copy -> gl_COPY+   AndInverted -> gl_AND_INVERTED+   Noop -> gl_NOOP+   Xor -> gl_XOR+   Or -> gl_OR+   Nor -> gl_NOR+   Equiv -> gl_EQUIV+   Invert -> gl_INVERT+   OrReverse -> gl_OR_REVERSE+   CopyInverted -> gl_COPY_INVERTED+   OrInverted -> gl_OR_INVERTED+   Nand -> gl_NAND+   Set -> gl_SET  unmarshalLogicOp :: GLenum -> LogicOp unmarshalLogicOp x-   | x == 0x1500 = Clear-   | x == 0x1501 = And-   | x == 0x1502 = AndReverse-   | x == 0x1503 = Copy-   | x == 0x1504 = AndInverted-   | x == 0x1505 = Noop-   | x == 0x1506 = Xor-   | x == 0x1507 = Or-   | x == 0x1508 = Nor-   | x == 0x1509 = Equiv-   | x == 0x150a = Invert-   | x == 0x150b = OrReverse-   | x == 0x150c = CopyInverted-   | x == 0x150d = OrInverted-   | x == 0x150e = Nand-   | x == 0x150f = Set+   | x == gl_CLEAR = Clear+   | x == gl_AND = And+   | x == gl_AND_REVERSE = AndReverse+   | x == gl_COPY = Copy+   | x == gl_AND_INVERTED = AndInverted+   | x == gl_NOOP = Noop+   | x == gl_XOR = Xor+   | x == gl_OR = Or+   | x == gl_NOR = Nor+   | x == gl_EQUIV = Equiv+   | x == gl_INVERT = Invert+   | x == gl_OR_REVERSE = OrReverse+   | x == gl_COPY_INVERTED = CopyInverted+   | x == gl_OR_INVERTED = OrInverted+   | x == gl_NAND = Nand+   | x == gl_SET = Set    | otherwise = error ("unmarshalLogicOp: illegal value " ++ show x)  --------------------------------------------------------------------------------@@ -542,5 +466,3 @@           return $ if rgba then CapColorLogicOp else CapIndexLogicOp)       (getEnum1 unmarshalLogicOp GetLogicOpMode)       (glLogicOp . marshalLogicOp)--foreign import CALLCONV unsafe "glLogicOp" glLogicOp :: GLenum -> IO ()

@@ -17,23 +17,15 @@    PixelData(..), withPixelData ) where -import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum )-import Graphics.Rendering.OpenGL.GL.DataType ( DataType, marshalDataType )-import Graphics.Rendering.OpenGL.GL.PixelFormat (-   PixelFormat, marshalPixelFormat )+import Foreign.Ptr+import Graphics.Rendering.OpenGL.GL.DataType+import Graphics.Rendering.OpenGL.GL.PixelFormat+import Graphics.Rendering.OpenGL.Raw.Core31  --------------------------------------------------------------------------------  data PixelData a = PixelData PixelFormat DataType (Ptr a)-#ifdef __HADDOCK__--- Help Haddock a bit, because it doesn't do any instance inference.-instance Eq (PixelData a)-instance Ord (PixelData a)-instance Show (PixelData a)-#else    deriving ( Eq, Ord, Show )-#endif  withPixelData :: PixelData a -> (GLenum -> GLenum -> Ptr a -> b) -> b withPixelData (PixelData pixelFormat dataType ptr) f =

@@ -17,7 +17,13 @@    PixelFormat(..), marshalPixelFormat, unmarshalPixelFormat ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum )+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   gl_COLOR_INDEX, gl_LUMINANCE, gl_LUMINANCE_ALPHA )+import Graphics.Rendering.OpenGL.Raw.Core31+import Graphics.Rendering.OpenGL.Raw.EXT.Abgr ( gl_ABGR )+import Graphics.Rendering.OpenGL.Raw.EXT.Cmyka ( gl_CMYK, gl_CMYKA )+import Graphics.Rendering.OpenGL.Raw.EXT.FourTwoTwoPixels (+   gl_422, gl_422_AVERAGE, gl_422_REV, gl_422_REV_AVERAGE )  -------------------------------------------------------------------------------- @@ -48,51 +54,53 @@  marshalPixelFormat :: PixelFormat -> GLenum marshalPixelFormat x = case x of-   ColorIndex -> 0x1900-   StencilIndex -> 0x1901-   DepthComponent -> 0x1902-   Red -> 0x1903-   Green -> 0x1904-   Blue -> 0x1905-   Alpha -> 0x1906-   RGB -> 0x1907-   RGBA -> 0x1908-   Luminance -> 0x1909-   LuminanceAlpha -> 0x190a-   ABGR -> 0x8000-   BGR -> 0x80E0-   BGRA -> 0x80E1-   CMYK -> 0x800C-   CMYKA -> 0x800D-   FourTwoTwo -> 0x80CC-   FourTwoTwoRev -> 0x80CD-   FourTwoTwoAverage -> 0x80CE-   FourTwoTwoRevAverage -> 0x80CF+   ColorIndex -> gl_COLOR_INDEX+   StencilIndex -> gl_STENCIL_INDEX+   DepthComponent -> gl_DEPTH_COMPONENT+   Red -> gl_RED+   Green -> gl_GREEN+   Blue -> gl_BLUE+   Alpha -> gl_ALPHA+   RGB -> gl_RGB+   RGBA -> gl_RGBA+   Luminance -> gl_LUMINANCE+   LuminanceAlpha -> gl_LUMINANCE_ALPHA+   ABGR -> gl_ABGR+   BGR -> gl_BGR+   BGRA -> gl_BGRA+   CMYK -> gl_CMYK+   CMYKA -> gl_CMYKA+   FourTwoTwo -> gl_422+   FourTwoTwoRev -> gl_422_REV+   FourTwoTwoAverage -> gl_422_AVERAGE+   FourTwoTwoRevAverage -> gl_422_REV_AVERAGE+   -- TODO: Use YCBCR_422_APPLE from APPLE_ycbcr_422 extension    YCBCR422 -> 0x85B9-   DepthStencil -> 0x84f9+   DepthStencil -> gl_DEPTH_STENCIL  unmarshalPixelFormat :: GLenum -> PixelFormat unmarshalPixelFormat x-   | x == 0x1900 = ColorIndex-   | x == 0x1901 = StencilIndex-   | x == 0x1902 = DepthComponent-   | x == 0x1903 = Red-   | x == 0x1904 = Green-   | x == 0x1905 = Blue-   | x == 0x1906 = Alpha-   | x == 0x1907 = RGB-   | x == 0x1908 = RGBA-   | x == 0x1909 = Luminance-   | x == 0x190a = LuminanceAlpha-   | x == 0x8000 = ABGR-   | x == 0x80E0 = BGR-   | x == 0x80E1 = BGRA-   | x == 0x800C = CMYK-   | x == 0x800D = CMYKA-   | x == 0x80CC = FourTwoTwo-   | x == 0x80CD = FourTwoTwoRev-   | x == 0x80CE = FourTwoTwoAverage-   | x == 0x80CF = FourTwoTwoRevAverage+   | x == gl_COLOR_INDEX = ColorIndex+   | x == gl_STENCIL_INDEX = StencilIndex+   | x == gl_DEPTH_COMPONENT = DepthComponent+   | x == gl_RED = Red+   | x == gl_GREEN = Green+   | x == gl_BLUE = Blue+   | x == gl_ALPHA = Alpha+   | x == gl_RGB = RGB+   | x == gl_RGBA = RGBA+   | x == gl_LUMINANCE = Luminance+   | x == gl_LUMINANCE_ALPHA = LuminanceAlpha+   | x == gl_ABGR = ABGR+   | x == gl_BGR = BGR+   | x == gl_BGRA = BGRA+   | x == gl_CMYK = CMYK+   | x == gl_CMYKA = CMYKA+   | x == gl_422 = FourTwoTwo+   | x == gl_422_REV = FourTwoTwoRev+   | x == gl_422_AVERAGE = FourTwoTwoAverage+   | x == gl_422_REV_AVERAGE = FourTwoTwoRevAverage+   -- TODO: Use YCBCR_422_APPLE from APPLE_ycbcr_422 extension    | x == 0x85B9 = YCBCR422-   | x == 0x84f9 = DepthStencil+   | x == gl_DEPTH_STENCIL = DepthStencil    | otherwise = error ("unmarshalPixelFormat: illegal value " ++ show x)

@@ -21,35 +21,33 @@    colorTableRGBASizes, colorTableLuminanceSize, colorTableIntesitySize, ) where -import Foreign.Marshal.Alloc ( alloca )-import Foreign.Marshal.Utils ( with )-import Foreign.Ptr ( Ptr )-import Foreign.Storable ( Storable(..) )-import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapColorTable,CapPostConvolutionColorTable,-             CapPostColorMatrixColorTable,CapTextureColorTable),-   makeCapability )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLenum, GLint, GLsizei, GLfloat, Capability )-import Graphics.Rendering.OpenGL.GL.CoordTrans ( Position(..) )-import Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO, Invoker, getProcAddress )-import Graphics.Rendering.OpenGL.GL.PeekPoke ( peek1 )-import Graphics.Rendering.OpenGL.GL.PixelRectangles.Rasterization (-    PixelData(..) )-import Graphics.Rendering.OpenGL.GL.PixelData ( withPixelData )-import Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat (-   PixelInternalFormat(..), marshalPixelInternalFormat',-   unmarshalPixelInternalFormat )-import Graphics.Rendering.OpenGL.GL.StateVar (-   GettableStateVar, makeGettableStateVar, StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GL.VertexSpec ( Color4(..) )-import Graphics.Rendering.OpenGL.GLU.ErrorsInternal (-   recordInvalidEnum )------------------------------------------------------------------------------------#include "HsOpenGLExt.h"+import Data.StateVar+import Foreign.Marshal.Alloc+import Foreign.Marshal.Utils+import Foreign.Ptr+import Foreign.Storable+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.CoordTrans+import Graphics.Rendering.OpenGL.GL.PeekPoke+import Graphics.Rendering.OpenGL.GL.PixelData+import Graphics.Rendering.OpenGL.GL.PixelRectangles.Rasterization+import Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.GLU.ErrorsInternal+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glColorSubTable, glColorTable, glColorTableParameterfv, glCopyColorSubTable,+   glCopyColorTable, glGetColorTable, glGetColorTableParameterfv,+   glGetColorTableParameteriv, gl_COLOR_TABLE, gl_COLOR_TABLE_ALPHA_SIZE,+   gl_COLOR_TABLE_BIAS, gl_COLOR_TABLE_BLUE_SIZE, gl_COLOR_TABLE_FORMAT,+   gl_COLOR_TABLE_GREEN_SIZE, gl_COLOR_TABLE_INTENSITY_SIZE,+   gl_COLOR_TABLE_LUMINANCE_SIZE, gl_COLOR_TABLE_RED_SIZE, gl_COLOR_TABLE_SCALE,+   gl_COLOR_TABLE_WIDTH, gl_POST_COLOR_MATRIX_COLOR_TABLE,+   gl_POST_CONVOLUTION_COLOR_TABLE, gl_PROXY_COLOR_TABLE,+   gl_PROXY_POST_COLOR_MATRIX_COLOR_TABLE,+   gl_PROXY_POST_CONVOLUTION_COLOR_TABLE )+import Graphics.Rendering.OpenGL.Raw.Core31+import Graphics.Rendering.OpenGL.Raw.EXT.SharedTexturePalette (+   gl_SHARED_TEXTURE_PALETTE )  -------------------------------------------------------------------------------- @@ -95,15 +93,16 @@  marshalColorTable :: ColorTable -> GLenum marshalColorTable x = case x of-   ColorTable -> 0x80d0-   PostConvolutionColorTable -> 0x80d1-   PostColorMatrixColorTable -> 0x80d2-   Texture1DColorTable -> 0xde0-   Texture2DColorTable -> 0xde1-   Texture3DColorTable -> 0x806f-   TextureCubeMapColorTable -> 0x8513+   ColorTable -> gl_COLOR_TABLE+   PostConvolutionColorTable -> gl_POST_CONVOLUTION_COLOR_TABLE+   PostColorMatrixColorTable -> gl_POST_COLOR_MATRIX_COLOR_TABLE+   Texture1DColorTable -> gl_TEXTURE_1D+   Texture2DColorTable -> gl_TEXTURE_2D+   Texture3DColorTable -> gl_TEXTURE_3D+   TextureCubeMapColorTable -> gl_TEXTURE_CUBE_MAP+   -- TODO: Use TEXTURE_COLOR_TABLE_SGI from SGI_texture_color_table extension    TextureColorTable -> 0x80bc-   SharedTexturePalette -> 0x81fb+   SharedTexturePalette -> gl_SHARED_TEXTURE_PALETTE  -------------------------------------------------------------------------------- @@ -117,13 +116,14 @@ marshalProxyColorTable :: Proxy -> ColorTable -> Maybe GLenum marshalProxyColorTable NoProxy x = Just (marshalColorTable x) marshalProxyColorTable Proxy   x = case x of-   ColorTable -> Just 0x80d3-   PostConvolutionColorTable -> Just 0x80d4-   PostColorMatrixColorTable -> Just 0x80d5-   Texture1DColorTable -> Just 0x8063-   Texture2DColorTable -> Just 0x8064-   Texture3DColorTable -> Just 0x8070-   TextureCubeMapColorTable -> Just 0x851b+   ColorTable -> Just gl_PROXY_COLOR_TABLE+   PostConvolutionColorTable -> Just gl_PROXY_POST_CONVOLUTION_COLOR_TABLE+   PostColorMatrixColorTable -> Just gl_PROXY_POST_COLOR_MATRIX_COLOR_TABLE+   Texture1DColorTable -> Just gl_PROXY_TEXTURE_1D+   Texture2DColorTable -> Just gl_PROXY_TEXTURE_2D+   Texture3DColorTable -> Just gl_PROXY_TEXTURE_3D+   TextureCubeMapColorTable -> Just gl_PROXY_TEXTURE_CUBE_MAP+   -- TODO: Use PROXY_TEXTURE_COLOR_TABLE_SGI from SGI_texture_color_table extension    TextureColorTable -> Just 0x80bd    SharedTexturePalette -> Nothing @@ -137,40 +137,30 @@             glColorTable target (marshalPixelInternalFormat' int) w)          (marshalProxyColorTable proxy ct) -EXTENSION_ENTRY("GL_ARB_imaging",glColorTable,GLenum -> GLenum -> GLsizei -> GLenum -> GLenum -> Ptr a -> IO ())- --------------------------------------------------------------------------------  getColorTable :: ColorTable -> PixelData a -> IO () getColorTable ct pd =    withPixelData pd $ glGetColorTable (marshalColorTable ct) -EXTENSION_ENTRY("GL_ARB_imaging",glGetColorTable,GLenum -> GLenum -> GLenum -> Ptr a -> IO ())- --------------------------------------------------------------------------------  copyColorTable :: ColorTable -> PixelInternalFormat -> Position -> GLsizei -> IO () copyColorTable ct int (Position x y) =    glCopyColorTable (marshalColorTable ct) (marshalPixelInternalFormat' int) x y -EXTENSION_ENTRY("GL_ARB_imaging",glCopyColorTable,GLenum -> GLenum -> GLint -> GLint -> GLsizei -> IO ())- --------------------------------------------------------------------------------  colorSubTable :: ColorTable -> GLsizei -> GLsizei -> PixelData a -> IO () colorSubTable ct start count pd =    withPixelData pd $ glColorSubTable (marshalColorTable ct) start count -EXTENSION_ENTRY("GL_ARB_imaging",glColorSubTable,GLenum -> GLsizei -> GLsizei -> GLenum -> GLenum -> Ptr a -> IO ())- --------------------------------------------------------------------------------  copyColorSubTable :: ColorTable -> GLsizei -> Position -> GLsizei -> IO () copyColorSubTable ct start (Position x y) =    glCopyColorSubTable (marshalColorTable ct) start x y -EXTENSION_ENTRY("GL_ARB_imaging",glCopyColorSubTable,GLenum -> GLsizei -> GLint -> GLint -> GLsizei -> IO ())- --------------------------------------------------------------------------------  data ColorTablePName =@@ -187,16 +177,16 @@  marshalColorTablePName :: ColorTablePName -> GLenum marshalColorTablePName x = case x of-   ColorTableScale -> 0x80d6-   ColorTableBias -> 0x80d7-   ColorTableFormat -> 0x80d8-   ColorTableWidth -> 0x80d9-   ColorTableRedSize -> 0x80da-   ColorTableGreenSize -> 0x80db-   ColorTableBlueSize -> 0x80dc-   ColorTableAlphaSize -> 0x80dd-   ColorTableLuminanceSize -> 0x80de-   ColorTableIntensitySize -> 0x80df+   ColorTableScale -> gl_COLOR_TABLE_SCALE+   ColorTableBias -> gl_COLOR_TABLE_BIAS+   ColorTableFormat -> gl_COLOR_TABLE_FORMAT+   ColorTableWidth -> gl_COLOR_TABLE_WIDTH+   ColorTableRedSize -> gl_COLOR_TABLE_RED_SIZE+   ColorTableGreenSize -> gl_COLOR_TABLE_GREEN_SIZE+   ColorTableBlueSize -> gl_COLOR_TABLE_BLUE_SIZE+   ColorTableAlphaSize -> gl_COLOR_TABLE_ALPHA_SIZE+   ColorTableLuminanceSize -> gl_COLOR_TABLE_LUMINANCE_SIZE+   ColorTableIntensitySize -> gl_COLOR_TABLE_INTENSITY_SIZE  -------------------------------------------------------------------------------- @@ -219,18 +209,14 @@       glGetColorTableParameterfv          (marshalColorTable ct)          (marshalColorTablePName p)-         buf+         (castPtr buf)       peek buf -EXTENSION_ENTRY("GL_ARB_imaging",glGetColorTableParameterfv,GLenum -> GLenum -> Ptr (Color4 GLfloat) -> IO ())- colorTableParameterC4f ::    ColorTable -> ColorTablePName -> Color4 GLfloat -> IO () colorTableParameterC4f ct p c =-   with c $-      glColorTableParameterfv (marshalColorTable ct) (marshalColorTablePName p)--EXTENSION_ENTRY("GL_ARB_imaging",glColorTableParameterfv,GLenum -> GLenum -> Ptr (Color4 GLfloat) -> IO ())+   with c $ \ptr -> +      glColorTableParameterfv (marshalColorTable ct) (marshalColorTablePName p) (castPtr ptr)  -------------------------------------------------------------------------------- @@ -247,8 +233,6 @@          (marshalColorTablePName p)          buf       peek1 f buf--EXTENSION_ENTRY("GL_ARB_imaging",glGetColorTableParameteriv,GLenum -> GLenum -> Ptr GLint -> IO ())  -------------------------------------------------------------------------------- 

@@ -25,35 +25,31 @@    convolutionFilterScale, convolutionFilterBias, ) where -import Foreign.Marshal.Alloc ( alloca )-import Foreign.Marshal.Utils ( with )-import Foreign.Ptr ( Ptr, nullPtr )-import Foreign.Storable ( Storable(..) )-import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapConvolution1D, CapConvolution2D,CapSeparable2D),-   makeCapability )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLenum, GLint, GLsizei, GLfloat, Capability )-import Graphics.Rendering.OpenGL.GL.CoordTrans ( Position(..), Size(..) )-import Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO, Invoker, getProcAddress )-import Graphics.Rendering.OpenGL.GL.PeekPoke ( peek1 )-import Graphics.Rendering.OpenGL.GL.PixelRectangles.ColorTable (-   PixelInternalFormat )-import Graphics.Rendering.OpenGL.GL.PixelRectangles.Rasterization (-    PixelData(..) )-import Graphics.Rendering.OpenGL.GL.PixelData ( withPixelData )-import Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat (-   marshalPixelInternalFormat' )-import Graphics.Rendering.OpenGL.GL.StateVar (-   GettableStateVar, makeGettableStateVar, StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GL.VertexSpec ( Color4(..) )-import Graphics.Rendering.OpenGL.GLU.ErrorsInternal (-   recordInvalidValue )------------------------------------------------------------------------------------#include "HsOpenGLExt.h"+import Data.StateVar+import Foreign.Marshal.Alloc+import Foreign.Marshal.Utils+import Foreign.Ptr+import Foreign.Storable+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.CoordTrans+import Graphics.Rendering.OpenGL.GL.PeekPoke+import Graphics.Rendering.OpenGL.GL.PixelData+import Graphics.Rendering.OpenGL.GL.PixelRectangles.Rasterization+import Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.GLU.ErrorsInternal+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glConvolutionFilter1D, glConvolutionFilter2D, glConvolutionParameterfv,+   glConvolutionParameteri, glCopyConvolutionFilter1D,+   glCopyConvolutionFilter2D, glGetConvolutionFilter,+   glGetConvolutionParameterfv, glGetConvolutionParameteriv,+   glGetSeparableFilter, glSeparableFilter2D, gl_CONSTANT_BORDER,+   gl_CONVOLUTION_1D, gl_CONVOLUTION_2D, gl_CONVOLUTION_BORDER_COLOR,+   gl_CONVOLUTION_BORDER_MODE, gl_CONVOLUTION_FILTER_BIAS,+   gl_CONVOLUTION_FILTER_SCALE, gl_CONVOLUTION_FORMAT, gl_CONVOLUTION_HEIGHT,+   gl_CONVOLUTION_WIDTH, gl_MAX_CONVOLUTION_HEIGHT, gl_MAX_CONVOLUTION_WIDTH,+   gl_REDUCE, gl_REPLICATE_BORDER, gl_SEPARABLE_2D )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -65,9 +61,9 @@  marshalConvolutionTarget :: ConvolutionTarget -> GLenum marshalConvolutionTarget x = case x of-   Convolution1D -> 0x8010-   Convolution2D -> 0x8011-   Separable2D -> 0x8012+   Convolution1D -> gl_CONVOLUTION_1D+   Convolution2D -> gl_CONVOLUTION_2D+   Separable2D -> gl_SEPARABLE_2D  convolutionTargetToEnableCap :: ConvolutionTarget -> EnableCap convolutionTargetToEnableCap x = case x of@@ -89,8 +85,6 @@          (marshalConvolutionTarget Convolution1D)          (marshalPixelInternalFormat' int) w -EXTENSION_ENTRY("GL_ARB_imaging",glConvolutionFilter1D,GLenum -> GLenum -> GLsizei -> GLenum -> GLenum -> Ptr a -> IO ())- --------------------------------------------------------------------------------  getConvolutionFilter1D :: PixelData a -> IO ()@@ -100,8 +94,6 @@ getConvolutionFilter t pd =    withPixelData pd $ glGetConvolutionFilter (marshalConvolutionTarget t) -EXTENSION_ENTRY("GL_ARB_imaging",glGetConvolutionFilter,GLenum -> GLenum -> GLenum -> Ptr a -> IO ())- --------------------------------------------------------------------------------  convolutionFilter2D :: PixelInternalFormat -> Size -> PixelData a -> IO ()@@ -111,8 +103,6 @@          (marshalConvolutionTarget Convolution2D)          (marshalPixelInternalFormat' int) w h -EXTENSION_ENTRY("GL_ARB_imaging",glConvolutionFilter2D,GLenum -> GLenum -> GLsizei -> GLsizei -> GLenum -> GLenum -> Ptr a -> IO ())- --------------------------------------------------------------------------------  getConvolutionFilter2D :: PixelData a -> IO ()@@ -131,8 +121,6 @@                     (marshalPixelInternalFormat' int) w h f1 d1 p1 p2             else recordInvalidValue -EXTENSION_ENTRY("GL_ARB_imaging",glSeparableFilter2D,GLenum -> GLenum -> GLsizei -> GLsizei -> GLenum -> GLenum -> Ptr a -> Ptr a -> IO ())- --------------------------------------------------------------------------------  getSeparableFilter2D :: PixelData a -> PixelData a -> IO ()@@ -144,8 +132,6 @@                     (marshalConvolutionTarget Separable2D) f1 d1 p1 p2 nullPtr             else recordInvalidValue -EXTENSION_ENTRY("GL_ARB_imaging",glGetSeparableFilter,GLenum -> GLenum -> GLenum -> Ptr a -> Ptr a -> Ptr a -> IO ())- --------------------------------------------------------------------------------  copyConvolutionFilter1D :: PixelInternalFormat -> Position -> GLsizei -> IO ()@@ -154,8 +140,6 @@       (marshalConvolutionTarget Convolution1D) (marshalPixelInternalFormat' int)       x y -EXTENSION_ENTRY("GL_ARB_imaging",glCopyConvolutionFilter1D,GLenum -> GLenum -> GLint -> GLint -> GLsizei -> IO ())- --------------------------------------------------------------------------------  copyConvolutionFilter2D :: PixelInternalFormat -> Position -> Size -> IO ()@@ -164,8 +148,6 @@       (marshalConvolutionTarget Convolution2D) (marshalPixelInternalFormat' int)       x y w h -EXTENSION_ENTRY("GL_ARB_imaging",glCopyConvolutionFilter2D,GLenum -> GLenum -> GLint -> GLint -> GLsizei -> GLsizei -> IO ())- --------------------------------------------------------------------------------  data ConvolutionParameter =@@ -182,15 +164,15 @@  marshalConvolutionParameter :: ConvolutionParameter -> GLenum marshalConvolutionParameter x = case x of-   ConvolutionBorderColor -> 0x8154-   ConvolutionBorderMode -> 0x8013-   ConvolutionFilterScale -> 0x8014-   ConvolutionFilterBias -> 0x8015-   ConvolutionFormat -> 0x8017-   ConvolutionWidth -> 0x8018-   ConvolutionHeight -> 0x8019-   MaxConvolutionWidth -> 0x801a-   MaxConvolutionHeight -> 0x801b+   ConvolutionBorderColor -> gl_CONVOLUTION_BORDER_COLOR+   ConvolutionBorderMode -> gl_CONVOLUTION_BORDER_MODE+   ConvolutionFilterScale -> gl_CONVOLUTION_FILTER_SCALE+   ConvolutionFilterBias -> gl_CONVOLUTION_FILTER_BIAS+   ConvolutionFormat -> gl_CONVOLUTION_FORMAT+   ConvolutionWidth -> gl_CONVOLUTION_WIDTH+   ConvolutionHeight -> gl_CONVOLUTION_HEIGHT+   MaxConvolutionWidth -> gl_MAX_CONVOLUTION_WIDTH+   MaxConvolutionHeight -> gl_MAX_CONVOLUTION_HEIGHT  -------------------------------------------------------------------------------- @@ -219,8 +201,6 @@          (marshalConvolutionTarget t) (marshalConvolutionParameter p) buf       peek1 f buf -EXTENSION_ENTRY("GL_ARB_imaging",glGetConvolutionParameteriv,GLenum -> GLenum -> Ptr GLint -> IO ())- --------------------------------------------------------------------------------  data ConvolutionBorderMode' =@@ -229,17 +209,18 @@    | ReplicateBorder'  marshalConvolutionBorderMode' :: ConvolutionBorderMode' -> GLint-marshalConvolutionBorderMode' x = case x of-   Reduce' -> 0x8016-   ConstantBorder' -> 0x8151-   ReplicateBorder' -> 0x8153+marshalConvolutionBorderMode' x = fromIntegral $ case x of+   Reduce' -> gl_REDUCE+   ConstantBorder' -> gl_CONSTANT_BORDER+   ReplicateBorder' -> gl_REPLICATE_BORDER  unmarshalConvolutionBorderMode' :: GLint -> ConvolutionBorderMode' unmarshalConvolutionBorderMode' x-   | x == 0x8016 = Reduce'-   | x == 0x8151 = ConstantBorder'-   | x == 0x8153 = ReplicateBorder'+   | y == gl_REDUCE = Reduce'+   | y == gl_CONSTANT_BORDER = ConstantBorder'+   | y == gl_REPLICATE_BORDER = ReplicateBorder'    | otherwise = error ("unmarshalConvolutionBorderMode': illegal value " ++ show x)+   where y = fromIntegral x  -------------------------------------------------------------------------------- @@ -283,8 +264,6 @@    glConvolutionParameteri       (marshalConvolutionTarget t) (marshalConvolutionParameter p) (f x) -EXTENSION_ENTRY("GL_ARB_imaging",glConvolutionParameteri,GLenum -> GLenum -> GLint -> IO ())- --------------------------------------------------------------------------------  convolutionFilterScale :: ConvolutionTarget -> StateVar (Color4 GLfloat)@@ -303,16 +282,12 @@ getConvolutionParameterC4f t p =    alloca $ \buf -> do       glGetConvolutionParameterfv-         (marshalConvolutionTarget t) (marshalConvolutionParameter p) buf+         (marshalConvolutionTarget t) (marshalConvolutionParameter p) (castPtr buf)       peek buf -EXTENSION_ENTRY("GL_ARB_imaging",glGetConvolutionParameterfv,GLenum -> GLenum -> Ptr (Color4 GLfloat) -> IO ())- convolutionParameterC4f ::    ConvolutionTarget -> ConvolutionParameter -> Color4 GLfloat -> IO () convolutionParameterC4f t p c =-   with c $+   with c $ \ptr ->       glConvolutionParameterfv-         (marshalConvolutionTarget t) (marshalConvolutionParameter p)--EXTENSION_ENTRY("GL_ARB_imaging",glConvolutionParameterfv,GLenum -> GLenum -> Ptr (Color4 GLfloat) -> IO ())+         (marshalConvolutionTarget t) (marshalConvolutionParameter p) (castPtr ptr)

@@ -18,34 +18,25 @@    histogramRGBASizes, histogramLuminanceSize ) where -import Foreign.Marshal.Alloc ( alloca )-import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapHistogram), makeStateVarMaybe )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLboolean, GLenum, GLint, GLsizei )-import Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO, Invoker, getProcAddress )-import Graphics.Rendering.OpenGL.GL.PeekPoke ( peek1 )-import Graphics.Rendering.OpenGL.GL.PixelRectangles.Rasterization (-    PixelData(..) )-import Graphics.Rendering.OpenGL.GL.PixelRectangles.ColorTable (-   PixelInternalFormat )-import Graphics.Rendering.OpenGL.GL.PixelData ( withPixelData )-import Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat (-   marshalPixelInternalFormat', unmarshalPixelInternalFormat )-import Graphics.Rendering.OpenGL.GL.PixelRectangles.ColorTable ( Proxy(..) )-import Graphics.Rendering.OpenGL.GL.PixelRectangles.Sink (-   Sink(..), marshalSink, unmarshalSink )-import Graphics.Rendering.OpenGL.GL.PixelRectangles.Reset (-   Reset(..), marshalReset )-import Graphics.Rendering.OpenGL.GL.StateVar (-   GettableStateVar, makeGettableStateVar, StateVar )-import Graphics.Rendering.OpenGL.GL.VertexSpec ( Color4(..) )------------------------------------------------------------------------------------#include "HsOpenGLExt.h"+import Data.StateVar+import Foreign.Marshal.Alloc+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.PeekPoke+import Graphics.Rendering.OpenGL.GL.PixelData+import Graphics.Rendering.OpenGL.GL.PixelRectangles.ColorTable+import Graphics.Rendering.OpenGL.GL.PixelRectangles.ColorTable+import Graphics.Rendering.OpenGL.GL.PixelRectangles.Rasterization+import Graphics.Rendering.OpenGL.GL.PixelRectangles.Reset+import Graphics.Rendering.OpenGL.GL.PixelRectangles.Sink+import Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glGetHistogram, glGetHistogramParameteriv, glHistogram, glResetHistogram,+   gl_HISTOGRAM, gl_HISTOGRAM_ALPHA_SIZE, gl_HISTOGRAM_BLUE_SIZE,+   gl_HISTOGRAM_FORMAT, gl_HISTOGRAM_GREEN_SIZE, gl_HISTOGRAM_LUMINANCE_SIZE,+   gl_HISTOGRAM_RED_SIZE, gl_HISTOGRAM_SINK, gl_HISTOGRAM_WIDTH,+   gl_PROXY_HISTOGRAM )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -55,8 +46,8 @@  marshalHistogramTarget :: HistogramTarget -> GLenum marshalHistogramTarget x = case x of-   Histogram -> 0x8024-   ProxyHistogram -> 0x8025+   Histogram -> gl_HISTOGRAM+   ProxyHistogram -> gl_PROXY_HISTOGRAM  proxyToHistogramTarget :: Proxy -> HistogramTarget proxyToHistogramTarget x = case x of@@ -87,8 +78,6 @@          buf       peek1 f buf -EXTENSION_ENTRY("GL_ARB_imaging",glGetHistogramParameteriv,GLenum -> GLenum -> Ptr GLint -> IO ())- setHistogram :: Proxy -> (GLsizei, PixelInternalFormat, Sink) -> IO () setHistogram proxy (w, int, sink) =    glHistogram@@ -96,8 +85,6 @@       w       (marshalPixelInternalFormat' int)       (marshalSink sink)-         -EXTENSION_ENTRY("GL_ARB_imaging",glHistogram,GLenum -> GLsizei -> GLenum -> GLboolean -> IO ())  -------------------------------------------------------------------------------- @@ -108,15 +95,11 @@          (marshalHistogramTarget Histogram)          (marshalReset reset) -EXTENSION_ENTRY("GL_ARB_imaging",glGetHistogram,GLenum -> GLboolean -> GLenum -> GLenum -> Ptr a -> IO ())- --------------------------------------------------------------------------------  resetHistogram :: IO () resetHistogram = glResetHistogram (marshalHistogramTarget Histogram) -EXTENSION_ENTRY("GL_ARB_imaging",glResetHistogram,GLenum -> IO ())- --------------------------------------------------------------------------------  data GetHistogramParameterPName =@@ -131,14 +114,14 @@  marshalGetHistogramParameterPName :: GetHistogramParameterPName -> GLenum marshalGetHistogramParameterPName x = case x of-   HistogramWidth -> 0x8026-   HistogramFormat -> 0x8027-   HistogramRedSize -> 0x8028-   HistogramGreenSize -> 0x8029-   HistogramBlueSize -> 0x802a-   HistogramAlphaSize -> 0x802b-   HistogramLuminanceSize -> 0x802c-   HistogramSink -> 0x802d+   HistogramWidth -> gl_HISTOGRAM_WIDTH+   HistogramFormat -> gl_HISTOGRAM_FORMAT+   HistogramRedSize -> gl_HISTOGRAM_RED_SIZE+   HistogramGreenSize -> gl_HISTOGRAM_GREEN_SIZE+   HistogramBlueSize -> gl_HISTOGRAM_BLUE_SIZE+   HistogramAlphaSize -> gl_HISTOGRAM_ALPHA_SIZE+   HistogramLuminanceSize -> gl_HISTOGRAM_LUMINANCE_SIZE+   HistogramSink -> gl_HISTOGRAM_SINK  -------------------------------------------------------------------------------- 

@@ -17,32 +17,19 @@    minmax, getMinmax, resetMinmax ) where -import Foreign.Marshal.Alloc ( alloca )-import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapMinmax), makeStateVarMaybe )-import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLboolean, GLenum, GLint )-import Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO, Invoker, getProcAddress )-import Graphics.Rendering.OpenGL.GL.PeekPoke ( peek1 )-import Graphics.Rendering.OpenGL.GL.PixelRectangles.ColorTable (-   PixelInternalFormat )-import Graphics.Rendering.OpenGL.GL.PixelRectangles.Rasterization (-    PixelData(..) )-import Graphics.Rendering.OpenGL.GL.PixelData ( withPixelData )-import Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat (-   marshalPixelInternalFormat', unmarshalPixelInternalFormat )-import Graphics.Rendering.OpenGL.GL.PixelRectangles.Histogram (-   Reset(..), Sink )-import Graphics.Rendering.OpenGL.GL.PixelRectangles.Reset (-   marshalReset )-import Graphics.Rendering.OpenGL.GL.PixelRectangles.Sink (-   marshalSink, unmarshalSink )-import Graphics.Rendering.OpenGL.GL.StateVar ( StateVar )------------------------------------------------------------------------------------#include "HsOpenGLExt.h"+import Data.StateVar+import Foreign.Marshal.Alloc+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.PeekPoke+import Graphics.Rendering.OpenGL.GL.PixelData+import Graphics.Rendering.OpenGL.GL.PixelRectangles.Rasterization+import Graphics.Rendering.OpenGL.GL.PixelRectangles.Reset+import Graphics.Rendering.OpenGL.GL.PixelRectangles.Sink+import Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glGetMinmax, glGetMinmaxParameteriv, glMinmax, glResetMinmax, gl_MINMAX,+   gl_MINMAX_FORMAT, gl_MINMAX_SINK )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -51,7 +38,7 @@  marshalMinmaxTarget :: MinmaxTarget -> GLenum marshalMinmaxTarget x = case x of-   Minmax -> 0x802e+   Minmax -> gl_MINMAX  -------------------------------------------------------------------------------- @@ -71,8 +58,6 @@       (marshalPixelInternalFormat' int)       (marshalSink sink) -EXTENSION_ENTRY("GL_ARB_imaging",glMinmax,GLenum -> GLenum -> GLboolean -> IO ())- --------------------------------------------------------------------------------  getMinmax :: Reset -> PixelData a -> IO ()@@ -80,15 +65,11 @@    withPixelData pd $       glGetMinmax (marshalMinmaxTarget Minmax) (marshalReset reset) -EXTENSION_ENTRY("GL_ARB_imaging",glGetMinmax,GLenum -> GLboolean -> GLenum -> GLenum -> Ptr a -> IO ())- --------------------------------------------------------------------------------  resetMinmax :: IO () resetMinmax = glResetMinmax (marshalMinmaxTarget Minmax) -EXTENSION_ENTRY("GL_ARB_imaging",glResetMinmax,GLenum -> IO ())- --------------------------------------------------------------------------------  data GetMinmaxParameterPName =@@ -97,8 +78,8 @@  marshalGetMinmaxParameterPName :: GetMinmaxParameterPName -> GLenum marshalGetMinmaxParameterPName x = case x of-   MinmaxFormat -> 0x802f-   MinmaxSink -> 0x8030+   MinmaxFormat -> gl_MINMAX_FORMAT+   MinmaxSink -> gl_MINMAX_SINK  -------------------------------------------------------------------------------- @@ -110,5 +91,3 @@          (marshalGetMinmaxParameterPName p)          buf       peek1 f buf--EXTENSION_ENTRY("GL_ARB_imaging",glGetMinmaxParameteriv,GLenum -> GLenum -> Ptr GLint -> IO ())

@@ -18,28 +18,22 @@    maxPixelMapTable, pixelMap, pixelMapIToRGBA, pixelMapRGBAToRGBA, ) where -import Data.List ( zipWith4 )-import Data.Word-import Foreign.ForeignPtr ( ForeignPtr, mallocForeignPtrArray, withForeignPtr )-import Foreign.Marshal.Array ( allocaArray, peekArray, pokeArray, withArrayLen )-import Foreign.Ptr ( Ptr )-import Foreign.Storable ( Storable(..) )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLenum, GLushort, GLuint, GLsizei, GLfloat )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetMaxPixelMapTable,GetPixelMapIToISize,GetPixelMapSToSSize,-            GetPixelMapIToRSize,GetPixelMapIToGSize,GetPixelMapIToBSize,-            GetPixelMapIToASize,GetPixelMapRToRSize,GetPixelMapGToGSize,-            GetPixelMapBToBSize,GetPixelMapAToASize),-   getInteger1, getSizei1 )-import Graphics.Rendering.OpenGL.GL.StateVar (-   HasSetter(($=)), HasGetter(get), GettableStateVar, makeGettableStateVar,-   StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GL.VertexSpec ( Color4(..) )------------------------------------------------------------------------------------#include "HsOpenGLTypes.h"+import Data.List+import Data.StateVar+import Foreign.C.Types+import Foreign.ForeignPtr+import Foreign.Marshal.Array+import Foreign.Ptr+import Foreign.Storable+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glGetPixelMapfv, glGetPixelMapuiv, glGetPixelMapusv, glPixelMapfv,+   glPixelMapuiv, glPixelMapusv, gl_PIXEL_MAP_A_TO_A, gl_PIXEL_MAP_B_TO_B,+   gl_PIXEL_MAP_G_TO_G, gl_PIXEL_MAP_I_TO_A, gl_PIXEL_MAP_I_TO_B,+   gl_PIXEL_MAP_I_TO_G, gl_PIXEL_MAP_I_TO_I, gl_PIXEL_MAP_I_TO_R,+   gl_PIXEL_MAP_R_TO_R, gl_PIXEL_MAP_S_TO_S )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -57,16 +51,16 @@  marshalPixelMapTarget :: PixelMapTarget -> GLenum marshalPixelMapTarget x = case x of-   IToI -> 0xc70-   SToS -> 0xc71-   IToR -> 0xc72-   IToG -> 0xc73-   IToB -> 0xc74-   IToA -> 0xc75-   RToR -> 0xc76-   GToG -> 0xc77-   BToB -> 0xc78-   AToA -> 0xc79+   IToI -> gl_PIXEL_MAP_I_TO_I+   SToS -> gl_PIXEL_MAP_S_TO_S+   IToR -> gl_PIXEL_MAP_I_TO_R+   IToG -> gl_PIXEL_MAP_I_TO_G+   IToB -> gl_PIXEL_MAP_I_TO_B+   IToA -> gl_PIXEL_MAP_I_TO_A+   RToR -> gl_PIXEL_MAP_R_TO_R+   GToG -> gl_PIXEL_MAP_G_TO_G+   BToB -> gl_PIXEL_MAP_B_TO_B+   AToA -> gl_PIXEL_MAP_A_TO_A  pixelMapTargetToGetPName :: PixelMapTarget -> GetPName pixelMapTargetToGetPName x = case x of@@ -92,36 +86,21 @@    getPixelMapv :: GLenum -> Ptr c -> IO ()    pixelMapv :: GLenum -> GLsizei -> Ptr c -> IO () -instance PixelMapComponent GLushort_ where+-- GLushort instance+instance PixelMapComponent CUShort where    getPixelMapv = glGetPixelMapusv    pixelMapv = glPixelMapusv -foreign import CALLCONV unsafe "glGetPixelMapusv" glGetPixelMapusv ::-   GLenum -> Ptr GLushort -> IO ()--foreign import CALLCONV unsafe "glPixelMapusv" glPixelMapusv ::-   GLenum -> GLsizei -> Ptr GLushort -> IO ()--instance PixelMapComponent GLuint_ where+-- GLuint instance+instance PixelMapComponent CUInt where    getPixelMapv = glGetPixelMapuiv    pixelMapv = glPixelMapuiv -foreign import CALLCONV unsafe "glGetPixelMapuiv" glGetPixelMapuiv ::-   GLenum -> Ptr GLuint -> IO ()--foreign import CALLCONV unsafe "glPixelMapuiv" glPixelMapuiv ::-   GLenum -> GLsizei -> Ptr GLuint -> IO ()--instance PixelMapComponent GLfloat_ where+-- GLfloat instance+instance PixelMapComponent CFloat where    getPixelMapv = glGetPixelMapfv    pixelMapv = glPixelMapfv -foreign import CALLCONV unsafe "glGetPixelMapfv" glGetPixelMapfv ::-   GLenum -> Ptr GLfloat -> IO ()--foreign import CALLCONV unsafe "glPixelMapfv" glPixelMapfv ::-   GLenum -> GLsizei -> Ptr GLfloat -> IO ()- --------------------------------------------------------------------------------  class PixelMap m where@@ -151,14 +130,7 @@ --------------------------------------------------------------------------------  data GLpixelmap a = GLpixelmap Int (ForeignPtr a)-#ifdef __HADDOCK__--- Help Haddock a bit, because it doesn't do any instance inference.-instance Eq (GLpixelmap a)-instance Ord (GLpixelmap a)-instance Show (GLpixelmap a)-#else    deriving ( Eq, Ord, Show )-#endif  instance PixelMap GLpixelmap where    withNewPixelMap size f = do

@@ -18,17 +18,10 @@    skipPixels, rowAlignment, imageHeight, skipImages ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum, GLint )-import Graphics.Rendering.OpenGL.GL.GLboolean (-   marshalGLboolean, unmarshalGLboolean )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetUnpackSwapBytes,GetUnpackLSBFirst,GetUnpackRowLength,-            GetUnpackSkipRows,GetUnpackSkipPixels,GetUnpackAlignment,-            GetUnpackImageHeight,GetUnpackSkipImages,GetPackSwapBytes,-            GetPackLSBFirst,GetPackRowLength,GetPackSkipRows,GetPackSkipPixels,-            GetPackAlignment,GetPackImageHeight,GetPackSkipImages),-   getBoolean1, getInteger1 )-import Graphics.Rendering.OpenGL.GL.StateVar ( StateVar, makeStateVar )+import Data.StateVar+import Graphics.Rendering.OpenGL.GL.GLboolean+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -59,22 +52,22 @@  marshalPixelStore :: PixelStore -> GLenum marshalPixelStore x = case x of-   UnpackSwapBytes -> 0xcf0-   UnpackLSBFirst -> 0xcf1-   UnpackRowLength -> 0xcf2-   UnpackSkipRows -> 0xcf3-   UnpackSkipPixels -> 0xcf4-   UnpackAlignment -> 0xcf5-   PackSwapBytes -> 0xd00-   PackLSBFirst -> 0xd01-   PackRowLength -> 0xd02-   PackSkipRows -> 0xd03-   PackSkipPixels -> 0xd04-   PackAlignment -> 0xd05-   PackSkipImages -> 0x806b-   PackImageHeight -> 0x806c-   UnpackSkipImages -> 0x806d-   UnpackImageHeight -> 0x806e+   UnpackSwapBytes -> gl_UNPACK_SWAP_BYTES+   UnpackLSBFirst -> gl_UNPACK_LSB_FIRST+   UnpackRowLength -> gl_UNPACK_ROW_LENGTH+   UnpackSkipRows -> gl_UNPACK_SKIP_ROWS+   UnpackSkipPixels -> gl_UNPACK_SKIP_PIXELS+   UnpackAlignment -> gl_UNPACK_ALIGNMENT+   PackSwapBytes -> gl_PACK_SWAP_BYTES+   PackLSBFirst -> gl_PACK_LSB_FIRST+   PackRowLength -> gl_PACK_ROW_LENGTH+   PackSkipRows -> gl_PACK_SKIP_ROWS+   PackSkipPixels -> gl_PACK_SKIP_PIXELS+   PackAlignment -> gl_PACK_ALIGNMENT+   PackSkipImages -> gl_PACK_SKIP_IMAGES+   PackImageHeight -> gl_PACK_IMAGE_HEIGHT+   UnpackSkipImages -> gl_UNPACK_SKIP_IMAGES+   UnpackImageHeight -> gl_UNPACK_IMAGE_HEIGHT  -------------------------------------------------------------------------------- @@ -123,6 +116,3 @@    makeStateVar       (getInteger1 id pn)       (glPixelStorei (marshalPixelStore ps))--foreign import CALLCONV unsafe "glPixelStorei" glPixelStorei ::-   GLenum -> GLint -> IO ()

@@ -19,25 +19,24 @@    rgbaScale, rgbaBias ) where -import Graphics.Rendering.OpenGL.GL.Capability (-   marshalCapability, unmarshalCapability )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLenum, GLint, GLfloat, Capability )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetMapColor,GetMapStencil,GetIndexShift,GetIndexOffset,-            GetRedScale,GetGreenScale,GetBlueScale,GetAlphaScale,GetDepthScale,-            GetRedBias,GetGreenBias,GetBlueBias,GetAlphaBias,GetDepthBias,-            GetPostConvolutionRedScale,GetPostConvolutionGreenScale,-            GetPostConvolutionBlueScale,GetPostConvolutionAlphaScale,-            GetPostConvolutionRedBias,GetPostConvolutionGreenBias,-            GetPostConvolutionBlueBias,GetPostConvolutionAlphaBias,-            GetPostColorMatrixRedScale,GetPostColorMatrixGreenScale,-            GetPostColorMatrixBlueScale,GetPostColorMatrixAlphaScale,-            GetPostColorMatrixRedBias,GetPostColorMatrixGreenBias,-            GetPostColorMatrixBlueBias,GetPostColorMatrixAlphaBias),-   getBoolean1, getInteger1, getFloat1 )-import Graphics.Rendering.OpenGL.GL.StateVar ( StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GL.VertexSpec ( Color4(..) )+import Data.StateVar+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glPixelTransferf, glPixelTransferi, gl_ALPHA_BIAS, gl_ALPHA_SCALE,+   gl_BLUE_BIAS, gl_BLUE_SCALE, gl_DEPTH_BIAS, gl_DEPTH_SCALE, gl_GREEN_BIAS,+   gl_GREEN_SCALE, gl_INDEX_OFFSET, gl_INDEX_SHIFT, gl_MAP_COLOR,+   gl_MAP_STENCIL, gl_POST_COLOR_MATRIX_ALPHA_BIAS,+   gl_POST_COLOR_MATRIX_ALPHA_SCALE, gl_POST_COLOR_MATRIX_BLUE_BIAS,+   gl_POST_COLOR_MATRIX_BLUE_SCALE, gl_POST_COLOR_MATRIX_GREEN_BIAS,+   gl_POST_COLOR_MATRIX_GREEN_SCALE, gl_POST_COLOR_MATRIX_RED_BIAS,+   gl_POST_COLOR_MATRIX_RED_SCALE, gl_POST_CONVOLUTION_ALPHA_BIAS,+   gl_POST_CONVOLUTION_ALPHA_SCALE, gl_POST_CONVOLUTION_BLUE_BIAS,+   gl_POST_CONVOLUTION_BLUE_SCALE, gl_POST_CONVOLUTION_GREEN_BIAS,+   gl_POST_CONVOLUTION_GREEN_SCALE, gl_POST_CONVOLUTION_RED_BIAS,+   gl_POST_CONVOLUTION_RED_SCALE, gl_RED_BIAS, gl_RED_SCALE )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -75,36 +74,36 @@  marshalPixelTransfer :: PixelTransfer -> GLenum marshalPixelTransfer x = case x of-   MapColor -> 0xd10-   MapStencil -> 0xd11-   IndexShift -> 0xd12-   IndexOffset -> 0xd13-   RedScale -> 0xd14-   RedBias -> 0xd15-   GreenScale -> 0xd18-   GreenBias -> 0xd19-   BlueScale -> 0xd1a-   BlueBias -> 0xd1b-   AlphaScale -> 0xd1c-   AlphaBias -> 0xd1d-   DepthScale -> 0xd1e-   DepthBias -> 0xd1f-   PostConvolutionRedScale -> 0x801c-   PostConvolutionGreenScale -> 0x801d-   PostConvolutionBlueScale -> 0x801e-   PostConvolutionAlphaScale -> 0x801f-   PostConvolutionRedBias -> 0x8020-   PostConvolutionGreenBias -> 0x8021-   PostConvolutionBlueBias -> 0x8022-   PostConvolutionAlphaBias -> 0x8023-   PostColorMatrixRedScale -> 0x80b4-   PostColorMatrixGreenScale -> 0x80b5-   PostColorMatrixBlueScale -> 0x80b6-   PostColorMatrixAlphaScale -> 0x80b7-   PostColorMatrixRedBias -> 0x80b8-   PostColorMatrixGreenBias -> 0x80b9-   PostColorMatrixBlueBias -> 0x80ba-   PostColorMatrixAlphaBias -> 0x80bb+   MapColor -> gl_MAP_COLOR+   MapStencil -> gl_MAP_STENCIL+   IndexShift -> gl_INDEX_SHIFT+   IndexOffset -> gl_INDEX_OFFSET+   RedScale -> gl_RED_SCALE+   RedBias -> gl_RED_BIAS+   GreenScale -> gl_GREEN_SCALE+   GreenBias -> gl_GREEN_BIAS+   BlueScale -> gl_BLUE_SCALE+   BlueBias -> gl_BLUE_BIAS+   AlphaScale -> gl_ALPHA_SCALE+   AlphaBias -> gl_ALPHA_BIAS+   DepthScale -> gl_DEPTH_SCALE+   DepthBias -> gl_DEPTH_BIAS+   PostConvolutionRedScale -> gl_POST_CONVOLUTION_RED_SCALE+   PostConvolutionGreenScale -> gl_POST_CONVOLUTION_GREEN_SCALE+   PostConvolutionBlueScale -> gl_POST_CONVOLUTION_BLUE_SCALE+   PostConvolutionAlphaScale -> gl_POST_CONVOLUTION_ALPHA_SCALE+   PostConvolutionRedBias -> gl_POST_CONVOLUTION_RED_BIAS+   PostConvolutionGreenBias -> gl_POST_CONVOLUTION_GREEN_BIAS+   PostConvolutionBlueBias -> gl_POST_CONVOLUTION_BLUE_BIAS+   PostConvolutionAlphaBias -> gl_POST_CONVOLUTION_ALPHA_BIAS+   PostColorMatrixRedScale -> gl_POST_COLOR_MATRIX_RED_SCALE+   PostColorMatrixGreenScale -> gl_POST_COLOR_MATRIX_GREEN_SCALE+   PostColorMatrixBlueScale -> gl_POST_COLOR_MATRIX_BLUE_SCALE+   PostColorMatrixAlphaScale -> gl_POST_COLOR_MATRIX_ALPHA_SCALE+   PostColorMatrixRedBias -> gl_POST_COLOR_MATRIX_RED_BIAS+   PostColorMatrixGreenBias -> gl_POST_COLOR_MATRIX_GREEN_BIAS+   PostColorMatrixBlueBias -> gl_POST_COLOR_MATRIX_BLUE_BIAS+   PostColorMatrixAlphaBias -> gl_POST_COLOR_MATRIX_ALPHA_BIAS  -------------------------------------------------------------------------------- @@ -223,9 +222,6 @@       (getInteger1 id pn)       (glPixelTransferi (marshalPixelTransfer pt)) -foreign import CALLCONV unsafe "glPixelTransferi" glPixelTransferi ::-   GLenum -> GLint -> IO ()- pixelTransferf :: GetPName -> PixelTransfer -> StateVar GLfloat pixelTransferf pn pt =    makeStateVar@@ -248,6 +244,3 @@             glPixelTransferf (marshalPixelTransfer tg) g             glPixelTransferf (marshalPixelTransfer tb) b             glPixelTransferf (marshalPixelTransfer ta) a--foreign import CALLCONV unsafe "glPixelTransferf" glPixelTransferf ::-   GLenum -> GLfloat -> IO ()

@@ -17,24 +17,21 @@    PixelData(..), PixelFormat(..), drawPixels, pixelZoom ) where -import Control.Monad ( liftM2 )-import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum, GLsizei, GLfloat )-import Graphics.Rendering.OpenGL.GL.CoordTrans ( Size(..) )-import Graphics.Rendering.OpenGL.GL.PixelData ( PixelData(..), withPixelData )-import Graphics.Rendering.OpenGL.GL.PixelFormat ( PixelFormat(..) )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetZoomX,GetZoomY), getFloat1 )-import Graphics.Rendering.OpenGL.GL.StateVar ( StateVar, makeStateVar )+import Control.Monad+import Data.StateVar+import Graphics.Rendering.OpenGL.GL.CoordTrans+import Graphics.Rendering.OpenGL.GL.PixelData+import Graphics.Rendering.OpenGL.GL.PixelFormat+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glDrawPixels, glPixelZoom )+import Graphics.Rendering.OpenGL.Raw.Core31  --------------------------------------------------------------------------------  drawPixels :: Size -> PixelData a -> IO () drawPixels (Size w h) pd = withPixelData pd $ glDrawPixels w h -foreign import CALLCONV unsafe "glDrawPixels" glDrawPixels ::-   GLsizei -> GLsizei -> GLenum -> GLenum -> Ptr a -> IO ()- --------------------------------------------------------------------------------  pixelZoom :: StateVar (GLfloat, GLfloat)@@ -42,6 +39,3 @@    makeStateVar       (liftM2 (,) (getFloat1 id GetZoomX) (getFloat1 id GetZoomY))       (uncurry glPixelZoom)--foreign import CALLCONV unsafe "glPixelZoom" glPixelZoom ::-   GLfloat -> GLfloat -> IO ()

@@ -17,8 +17,8 @@    Reset(..), marshalReset ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLboolean )-import Graphics.Rendering.OpenGL.GL.GLboolean ( marshalGLboolean )+import Graphics.Rendering.OpenGL.GL.GLboolean+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- 

@@ -17,9 +17,8 @@    Sink(..), marshalSink, unmarshalSink ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLboolean, GLint )-import Graphics.Rendering.OpenGL.GL.GLboolean (-   marshalGLboolean, unmarshalGLboolean )+import Graphics.Rendering.OpenGL.GL.GLboolean+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- 

@@ -17,14 +17,10 @@    PointParameter(..), pointParameterf, pointParameterfv ) where -import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum, GLfloat )-import Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO, Invoker, getProcAddress )------------------------------------------------------------------------------------#include "HsOpenGLExt.h"+import Foreign.Ptr+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+ gl_POINT_DISTANCE_ATTENUATION, gl_POINT_SIZE_MAX, gl_POINT_SIZE_MIN )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -36,19 +32,15 @@  marshalPointParameter :: PointParameter -> GLenum marshalPointParameter x = case x of-   PointSizeMin -> 0x8126-   PointSizeMax -> 0x8127-   PointFadeThresholdSize -> 0x8128-   PointDistanceAttenuation -> 0x8129+   PointSizeMin -> gl_POINT_SIZE_MIN+   PointSizeMax -> gl_POINT_SIZE_MAX+   PointFadeThresholdSize -> gl_POINT_FADE_THRESHOLD_SIZE+   PointDistanceAttenuation -> gl_POINT_DISTANCE_ATTENUATION  --------------------------------------------------------------------------------  pointParameterf :: PointParameter -> GLfloat -> IO ()-pointParameterf = glPointParameterfARB . marshalPointParameter--EXTENSION_ENTRY("GL_ARB_point_parameters or OpenGL 1.4",glPointParameterfARB,GLenum -> GLfloat -> IO ())+pointParameterf = glPointParameterf . marshalPointParameter  pointParameterfv :: PointParameter -> Ptr GLfloat -> IO ()-pointParameterfv = glPointParameterfvARB . marshalPointParameter--EXTENSION_ENTRY("GL_ARB_point_parameters or OpenGL 1.4",glPointParameterfvARB,GLenum -> Ptr GLfloat -> IO ())+pointParameterfv = glPointParameterfv . marshalPointParameter

@@ -32,21 +32,13 @@    aliasedPointSizeRange, smoothPointSizeRange, smoothPointSizeGranularity ) where -import Control.Monad ( liftM2 )-import Foreign.Marshal.Array ( withArray )-import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapVertexProgramPointSize,CapPointSmooth,CapPointSprite),-   makeCapability )-import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLfloat, Capability )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetPointSize,GetAliasedPointSizeRange,GetSmoothPointSizeRange,-            GetSmoothPointSizeGranularity,GetPointSizeMin,GetPointSizeMax,-            GetPointDistanceAttenuation,GetPointFadeThresholdSize),-   getFloat1, getFloat2, getFloat3 )-import Graphics.Rendering.OpenGL.GL.PointParameter (-   PointParameter(..), pointParameterf, pointParameterfv )-import Graphics.Rendering.OpenGL.GL.StateVar (-   GettableStateVar, makeGettableStateVar, StateVar, makeStateVar )+import Control.Monad+import Data.StateVar+import Foreign.Marshal.Array+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.PointParameter+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -136,8 +128,6 @@ pointSize :: StateVar GLfloat pointSize = makeStateVar (getFloat1 id GetPointSize) glPointSize -foreign import CALLCONV unsafe "glPointSize" glPointSize :: GLfloat -> IO ()- --------------------------------------------------------------------------------  vertexProgramPointSize :: StateVar Capability@@ -191,7 +181,7 @@ --------------------------------------------------------------------------------  -- | Controls whether point antialiasing is enabled. The initial state is--- 'Graphics.Rendering.OpenGL.GL.BasicTypes.Disabled'.+-- 'Graphics.Rendering.OpenGL.GL.Capability.Disabled'.  pointSmooth :: StateVar Capability pointSmooth = makeCapability CapPointSmooth@@ -199,7 +189,7 @@ --------------------------------------------------------------------------------  -- | Controls whether point sprites are enabled. The initial state is--- 'Graphics.Rendering.OpenGL.GL.BasicTypes.Disabled'. When point sprites are+-- 'Graphics.Rendering.OpenGL.GL.Capability.Disabled'. When point sprites are -- enabled, the state of point antialiasing (i.e. 'pointSmooth') is ignored.  pointSprite :: StateVar Capability

@@ -17,7 +17,7 @@    PolygonMode(..), marshalPolygonMode, unmarshalPolygonMode ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -29,13 +29,13 @@  marshalPolygonMode :: PolygonMode -> GLenum marshalPolygonMode x = case x of-   Point -> 0x1b00-   Line -> 0x1b01-   Fill -> 0x1b02+   Point -> gl_POINT+   Line -> gl_LINE+   Fill -> gl_FILL  unmarshalPolygonMode :: GLenum -> PolygonMode unmarshalPolygonMode x-   | x == 0x1b00 = Point-   | x == 0x1b01 = Line-   | x == 0x1b02 = Fill+   | x == gl_POINT = Point+   | x == gl_LINE = Line+   | x == gl_FILL = Fill    | otherwise = error ("unmarshalPolygonMode: illegal value " ++ show x)

@@ -19,30 +19,20 @@    polygonOffsetPoint, polygonOffsetLine, polygonOffsetFill ) where -import Control.Monad ( liftM2 )-import Foreign.ForeignPtr ( ForeignPtr, mallocForeignPtrArray, withForeignPtr )-import Foreign.Marshal.Array ( allocaArray, withArray, peekArray, pokeArray )-import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapPolygonSmooth,CapCullFace,CapPolygonStipple,-             CapPolygonOffsetPoint,CapPolygonOffsetLine,CapPolygonOffsetFill),-   makeCapability, makeStateVarMaybe )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLenum, GLubyte, GLfloat, Capability )-import Graphics.Rendering.OpenGL.GL.Face ( marshalFace, unmarshalFace )-import Graphics.Rendering.OpenGL.GL.Colors ( Face(..) )-import Graphics.Rendering.OpenGL.GL.PixelRectangles (-   PixelStoreDirection(..), rowLength, skipRows, skipPixels )-import Graphics.Rendering.OpenGL.GL.PolygonMode (-   PolygonMode(..), marshalPolygonMode, unmarshalPolygonMode )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetCullFaceMode,GetPolygonMode,GetPolygonOffsetFactor,-            GetPolygonOffsetUnits),-   getInteger2, getEnum1, getFloat1 )-import Graphics.Rendering.OpenGL.GL.SavingState (-   ClientAttributeGroup(PixelStoreAttributes), preservingClientAttrib )-import Graphics.Rendering.OpenGL.GL.StateVar (-   HasSetter(($=)), StateVar, makeStateVar )+import Control.Monad+import Data.StateVar+import Foreign.ForeignPtr+import Foreign.Marshal.Array+import Foreign.Ptr+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.Face+import Graphics.Rendering.OpenGL.GL.PixelRectangles+import Graphics.Rendering.OpenGL.GL.PolygonMode+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.SavingState+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glPolygonStipple, glGetPolygonStipple )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -56,8 +46,6 @@                              (getEnum1 unmarshalFace GetCullFaceMode)                              (glCullFace . marshalFace) -foreign import CALLCONV unsafe "glCullFace" glCullFace :: GLenum -> IO ()- --------------------------------------------------------------------------------  numPolygonStippleBytes :: Int@@ -117,12 +105,6 @@       skipPixels direction $= 0       action -foreign import CALLCONV unsafe "glGetPolygonStipple" glGetPolygonStipple ::-   Ptr GLubyte -> IO ()--foreign import CALLCONV unsafe "glPolygonStipple" glPolygonStipple ::-   Ptr GLubyte -> IO ()- --------------------------------------------------------------------------------  polygonMode :: StateVar (PolygonMode, PolygonMode)@@ -137,9 +119,6 @@    glPolygonMode (marshalFace Front) (marshalPolygonMode front)    glPolygonMode (marshalFace Back ) (marshalPolygonMode back ) -foreign import CALLCONV unsafe "glPolygonMode" glPolygonMode ::-   GLenum -> GLenum -> IO ()- --------------------------------------------------------------------------------  polygonOffset :: StateVar (GLfloat, GLfloat)@@ -147,9 +126,6 @@    makeStateVar (liftM2 (,) (getFloat1 id GetPolygonOffsetFactor)                             (getFloat1 id GetPolygonOffsetUnits))                 (uncurry glPolygonOffset)--foreign import CALLCONV unsafe "glPolygonOffset" glPolygonOffset ::-   GLfloat -> GLfloat -> IO ()  -------------------------------------------------------------------------------- 

@@ -17,7 +17,9 @@    PrimitiveMode(..), marshalPrimitiveMode, unmarshalPrimitiveMode ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum )+import Graphics.Rendering.OpenGL.Raw.Core31+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   gl_QUADS, gl_QUAD_STRIP, gl_POLYGON )  -------------------------------------------------------------------------------- @@ -70,27 +72,27 @@  marshalPrimitiveMode :: PrimitiveMode -> GLenum marshalPrimitiveMode x = case x of-   Points -> 0x0-   Lines -> 0x1-   LineLoop -> 0x2-   LineStrip -> 0x3-   Triangles -> 0x4-   TriangleStrip -> 0x5-   TriangleFan -> 0x6-   Quads -> 0x7-   QuadStrip -> 0x8-   Polygon -> 0x9+   Points -> gl_POINTS+   Lines -> gl_LINES+   LineLoop -> gl_LINE_LOOP+   LineStrip -> gl_LINE_STRIP+   Triangles -> gl_TRIANGLES+   TriangleStrip -> gl_TRIANGLE_STRIP+   TriangleFan -> gl_TRIANGLE_FAN+   Quads -> gl_QUADS+   QuadStrip -> gl_QUAD_STRIP+   Polygon -> gl_POLYGON  unmarshalPrimitiveMode :: GLenum -> PrimitiveMode unmarshalPrimitiveMode x-   | x == 0x0 = Points-   | x == 0x1 = Lines-   | x == 0x2 = LineLoop-   | x == 0x3 = LineStrip-   | x == 0x4 = Triangles-   | x == 0x5 = TriangleStrip-   | x == 0x6 = TriangleFan-   | x == 0x7 = Quads-   | x == 0x8 = QuadStrip-   | x == 0x9 = Polygon+   | x == gl_POINTS = Points+   | x == gl_LINES = Lines+   | x == gl_LINE_LOOP = LineLoop+   | x == gl_LINE_STRIP = LineStrip+   | x == gl_TRIANGLES = Triangles+   | x == gl_TRIANGLE_STRIP = TriangleStrip+   | x == gl_TRIANGLE_FAN = TriangleFan+   | x == gl_QUADS = Quads+   | x == gl_QUAD_STRIP = QuadStrip+   | x == gl_POLYGON = Polygon    | otherwise = error ("unmarshalPrimitiveMode: illegal value " ++ show x)

@@ -30,20 +30,111 @@    GetVertexAttribPointerPName(..), getVertexAttribPointer ) where -import Foreign.Marshal.Alloc ( alloca )-import Foreign.Marshal.Array ( allocaArray )-import Foreign.Ptr ( Ptr, nullPtr )-import Foreign.Storable ( Storable(peek) )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLboolean, GLenum, GLint, GLsizei, GLuint, GLfloat, GLdouble )-import Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO, Invoker, getProcAddress )-import Graphics.Rendering.OpenGL.GL.PeekPoke ( peek1, peek2, peek3, peek4 )-import Graphics.Rendering.OpenGL.GLU.ErrorsInternal ( recordInvalidEnum )------------------------------------------------------------------------------------#include "HsOpenGLExt.h"+import Foreign.Marshal.Alloc+import Foreign.Marshal.Array+import Foreign.Ptr+import Foreign.Storable+import Graphics.Rendering.OpenGL.GL.PeekPoke+import Graphics.Rendering.OpenGL.GLU.ErrorsInternal+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   gl_ACCUM_ALPHA_BITS, gl_ACCUM_BLUE_BITS, gl_ACCUM_CLEAR_VALUE,+   gl_ACCUM_GREEN_BITS, gl_ACCUM_RED_BITS, gl_ALIASED_POINT_SIZE_RANGE,+   gl_ALPHA_BIAS, gl_ALPHA_BITS, gl_ALPHA_SCALE, gl_ALPHA_TEST,+   gl_ALPHA_TEST_FUNC, gl_ALPHA_TEST_REF, gl_ATTRIB_STACK_DEPTH, gl_AUTO_NORMAL,+   gl_AUX_BUFFERS, gl_BLUE_BIAS, gl_BLUE_BITS, gl_BLUE_SCALE,+   gl_CLIENT_ACTIVE_TEXTURE, gl_CLIENT_ATTRIB_STACK_DEPTH, gl_COLOR_ARRAY,+   gl_COLOR_ARRAY_BUFFER_BINDING, gl_COLOR_ARRAY_SIZE, gl_COLOR_ARRAY_STRIDE,+   gl_COLOR_ARRAY_TYPE, gl_COLOR_MATERIAL, gl_COLOR_MATERIAL_FACE,+   gl_COLOR_MATERIAL_PARAMETER, gl_COLOR_MATRIX, gl_COLOR_MATRIX_STACK_DEPTH,+   gl_COLOR_SUM, gl_COLOR_TABLE, gl_CONVOLUTION_1D, gl_CONVOLUTION_2D,+   gl_CURRENT_COLOR, gl_CURRENT_FOG_COORD, gl_CURRENT_INDEX, gl_CURRENT_NORMAL,+   gl_CURRENT_RASTER_COLOR, gl_CURRENT_RASTER_DISTANCE, gl_CURRENT_RASTER_INDEX,+   gl_CURRENT_RASTER_POSITION, gl_CURRENT_RASTER_POSITION_VALID,+   gl_CURRENT_RASTER_SECONDARY_COLOR, gl_CURRENT_RASTER_TEXTURE_COORDS,+   gl_CURRENT_SECONDARY_COLOR, gl_CURRENT_TEXTURE_COORDS, gl_DEPTH_BIAS,+   gl_DEPTH_BITS, gl_DEPTH_SCALE, gl_EDGE_FLAG, gl_EDGE_FLAG_ARRAY,+   gl_EDGE_FLAG_ARRAY_BUFFER_BINDING, gl_EDGE_FLAG_ARRAY_STRIDE,+   gl_FEEDBACK_BUFFER_SIZE, gl_FEEDBACK_BUFFER_TYPE, gl_FOG, gl_FOG_COLOR,+   gl_FOG_COORD_ARRAY, gl_FOG_COORD_ARRAY_BUFFER_BINDING,+   gl_FOG_COORD_ARRAY_STRIDE, gl_FOG_COORD_ARRAY_TYPE, gl_FOG_COORD_SRC,+   gl_FOG_DENSITY, gl_FOG_END, gl_FOG_HINT, gl_FOG_INDEX, gl_FOG_MODE,+   gl_FOG_START, gl_GENERATE_MIPMAP_HINT, gl_GREEN_BIAS, gl_GREEN_BITS,+   gl_GREEN_SCALE, gl_HISTOGRAM, gl_INDEX_ARRAY, gl_INDEX_ARRAY_BUFFER_BINDING,+   gl_INDEX_ARRAY_STRIDE, gl_INDEX_ARRAY_TYPE, gl_INDEX_BITS,+   gl_INDEX_CLEAR_VALUE, gl_INDEX_LOGIC_OP, gl_INDEX_MODE, gl_INDEX_OFFSET,+   gl_INDEX_SHIFT, gl_INDEX_WRITEMASK, gl_LIGHT0, gl_LIGHTING,+   gl_LIGHT_MODEL_AMBIENT, gl_LIGHT_MODEL_COLOR_CONTROL,+   gl_LIGHT_MODEL_LOCAL_VIEWER, gl_LIGHT_MODEL_TWO_SIDE, gl_LINE_STIPPLE,+   gl_LINE_STIPPLE_PATTERN, gl_LINE_STIPPLE_REPEAT, gl_LIST_BASE, gl_LIST_INDEX,+   gl_LIST_MODE, gl_MAP1_COLOR_4, gl_MAP1_GRID_DOMAIN, gl_MAP1_GRID_SEGMENTS,+   gl_MAP1_INDEX, gl_MAP1_NORMAL, gl_MAP1_TEXTURE_COORD_1,+   gl_MAP1_TEXTURE_COORD_2, gl_MAP1_TEXTURE_COORD_3, gl_MAP1_TEXTURE_COORD_4,+   gl_MAP1_VERTEX_3, gl_MAP1_VERTEX_4, gl_MAP2_COLOR_4, gl_MAP2_GRID_DOMAIN,+   gl_MAP2_GRID_SEGMENTS, gl_MAP2_INDEX, gl_MAP2_NORMAL,+   gl_MAP2_TEXTURE_COORD_1, gl_MAP2_TEXTURE_COORD_2, gl_MAP2_TEXTURE_COORD_3,+   gl_MAP2_TEXTURE_COORD_4, gl_MAP2_VERTEX_3, gl_MAP2_VERTEX_4, gl_MAP_COLOR,+   gl_MAP_STENCIL, gl_MATRIX_MODE, gl_MAX_ATTRIB_STACK_DEPTH,+   gl_MAX_CLIENT_ATTRIB_STACK_DEPTH, gl_MAX_COLOR_MATRIX_STACK_DEPTH,+   gl_MAX_CONVOLUTION_HEIGHT, gl_MAX_CONVOLUTION_WIDTH, gl_MAX_EVAL_ORDER,+   gl_MAX_LIGHTS, gl_MAX_LIST_NESTING, gl_MAX_MODELVIEW_STACK_DEPTH,+   gl_MAX_NAME_STACK_DEPTH, gl_MAX_PIXEL_MAP_TABLE,+   gl_MAX_PROJECTION_STACK_DEPTH, gl_MAX_TEXTURE_COORDS,+   gl_MAX_TEXTURE_STACK_DEPTH, gl_MAX_TEXTURE_UNITS, gl_MINMAX, gl_MODELVIEW,+   gl_MODELVIEW_MATRIX, gl_MODELVIEW_STACK_DEPTH, gl_NAME_STACK_DEPTH,+   gl_NORMALIZE, gl_NORMAL_ARRAY, gl_NORMAL_ARRAY_BUFFER_BINDING,+   gl_NORMAL_ARRAY_STRIDE, gl_NORMAL_ARRAY_TYPE, gl_PERSPECTIVE_CORRECTION_HINT,+   gl_PIXEL_MAP_A_TO_A_SIZE, gl_PIXEL_MAP_B_TO_B_SIZE, gl_PIXEL_MAP_G_TO_G_SIZE,+   gl_PIXEL_MAP_I_TO_A_SIZE, gl_PIXEL_MAP_I_TO_B_SIZE, gl_PIXEL_MAP_I_TO_G_SIZE,+   gl_PIXEL_MAP_I_TO_I_SIZE, gl_PIXEL_MAP_I_TO_R_SIZE, gl_PIXEL_MAP_R_TO_R_SIZE,+   gl_PIXEL_MAP_S_TO_S_SIZE, gl_POINT_DISTANCE_ATTENUATION, gl_POINT_SIZE_MAX,+   gl_POINT_SIZE_MIN, gl_POINT_SMOOTH, gl_POINT_SMOOTH_HINT, gl_POLYGON_MODE,+   gl_POLYGON_STIPPLE, gl_POST_COLOR_MATRIX_ALPHA_BIAS,+   gl_POST_COLOR_MATRIX_ALPHA_SCALE, gl_POST_COLOR_MATRIX_BLUE_BIAS,+   gl_POST_COLOR_MATRIX_BLUE_SCALE, gl_POST_COLOR_MATRIX_COLOR_TABLE,+   gl_POST_COLOR_MATRIX_GREEN_BIAS, gl_POST_COLOR_MATRIX_GREEN_SCALE,+   gl_POST_COLOR_MATRIX_RED_BIAS, gl_POST_COLOR_MATRIX_RED_SCALE,+   gl_POST_CONVOLUTION_ALPHA_BIAS, gl_POST_CONVOLUTION_ALPHA_SCALE,+   gl_POST_CONVOLUTION_BLUE_BIAS, gl_POST_CONVOLUTION_BLUE_SCALE,+   gl_POST_CONVOLUTION_COLOR_TABLE, gl_POST_CONVOLUTION_GREEN_BIAS,+   gl_POST_CONVOLUTION_GREEN_SCALE, gl_POST_CONVOLUTION_RED_BIAS,+   gl_POST_CONVOLUTION_RED_SCALE, gl_PROJECTION_MATRIX,+   gl_PROJECTION_STACK_DEPTH, gl_RED_BIAS, gl_RED_BITS, gl_RED_SCALE,+   gl_RENDER_MODE, gl_RESCALE_NORMAL, gl_RGBA_MODE, gl_SECONDARY_COLOR_ARRAY,+   gl_SECONDARY_COLOR_ARRAY_BUFFER_BINDING, gl_SECONDARY_COLOR_ARRAY_SIZE,+   gl_SECONDARY_COLOR_ARRAY_STRIDE, gl_SECONDARY_COLOR_ARRAY_TYPE,+   gl_SELECTION_BUFFER_SIZE, gl_SEPARABLE_2D, gl_SHADE_MODEL, gl_STENCIL_BITS,+   gl_TEXTURE_COORD_ARRAY, gl_TEXTURE_COORD_ARRAY_BUFFER_BINDING,+   gl_TEXTURE_COORD_ARRAY_SIZE, gl_TEXTURE_COORD_ARRAY_STRIDE,+   gl_TEXTURE_COORD_ARRAY_TYPE, gl_TEXTURE_GEN_Q, gl_TEXTURE_GEN_R,+   gl_TEXTURE_GEN_S, gl_TEXTURE_GEN_T, gl_TEXTURE_MATRIX,+   gl_TEXTURE_STACK_DEPTH, gl_TRANSPOSE_COLOR_MATRIX,+   gl_TRANSPOSE_MODELVIEW_MATRIX, gl_TRANSPOSE_PROJECTION_MATRIX,+   gl_TRANSPOSE_TEXTURE_MATRIX, gl_VERTEX_ARRAY, gl_VERTEX_ARRAY_BUFFER_BINDING,+   gl_VERTEX_ARRAY_SIZE, gl_VERTEX_ARRAY_STRIDE, gl_VERTEX_ARRAY_TYPE,+   gl_ZOOM_X, gl_ZOOM_Y )+import Graphics.Rendering.OpenGL.Raw.ARB.FragmentProgram (+   gl_CURRENT_MATRIX, gl_CURRENT_MATRIX_STACK_DEPTH )+import Graphics.Rendering.OpenGL.Raw.ARB.MatrixPalette (+   gl_CURRENT_MATRIX_INDEX, gl_CURRENT_PALETTE_MATRIX, gl_MATRIX_INDEX_ARRAY,+   gl_MATRIX_INDEX_ARRAY_SIZE, gl_MATRIX_INDEX_ARRAY_STRIDE,+   gl_MATRIX_INDEX_ARRAY_TYPE, gl_MATRIX_PALETTE,+   gl_MAX_MATRIX_PALETTE_STACK_DEPTH, gl_MAX_PALETTE_MATRICES )+import Graphics.Rendering.OpenGL.Raw.ARB.VertexBlend (+   gl_ACTIVE_VERTEX_UNITS, gl_CURRENT_WEIGHT, gl_MAX_VERTEX_UNITS,+   gl_MODELVIEW1, gl_MODELVIEW2, gl_MODELVIEW31, gl_VERTEX_BLEND,+   gl_WEIGHT_ARRAY, gl_WEIGHT_ARRAY_SIZE, gl_WEIGHT_ARRAY_STRIDE,+   gl_WEIGHT_ARRAY_TYPE, gl_WEIGHT_SUM_UNITY )+import Graphics.Rendering.OpenGL.Raw.Core31+import Graphics.Rendering.OpenGL.Raw.EXT ( gl_RGBA_SIGNED_COMPONENTS )+import Graphics.Rendering.OpenGL.Raw.EXT.Cmyka ( gl_PACK_CMYK_HINT, gl_UNPACK_CMYK_HINT )+import Graphics.Rendering.OpenGL.Raw.EXT.CompiledVertexArray ( gl_ARRAY_ELEMENT_LOCK_FIRST, gl_ARRAY_ELEMENT_LOCK_COUNT )+import Graphics.Rendering.OpenGL.Raw.EXT.DepthBoundsTest ( gl_DEPTH_BOUNDS, )+import Graphics.Rendering.OpenGL.Raw.EXT.SharedTexturePalette ( gl_SHARED_TEXTURE_PALETTE )+import Graphics.Rendering.OpenGL.Raw.EXT.StencilTwoSide ( gl_ACTIVE_STENCIL_FACE )+import Graphics.Rendering.OpenGL.Raw.EXT.TextureFilterAnisotropic ( gl_MAX_TEXTURE_MAX_ANISOTROPY )+import Graphics.Rendering.OpenGL.Raw.NV.FogDistance ( gl_FOG_DISTANCE_MODE )+import Graphics.Rendering.OpenGL.Raw.NV.LightMaxExponent (  gl_MAX_SHININESS, gl_MAX_SPOT_EXPONENT )+import Graphics.Rendering.OpenGL.Raw.NV.PrimitiveRestart ( gl_PRIMITIVE_RESTART_INDEX_NV, gl_PRIMITIVE_RESTART_NV )  -------------------------------------------------------------------------------- @@ -398,6 +489,8 @@    | GetFogDistanceMode    | GetDepthBounds    | GetPrimitiveRestartIndex+   | GetPrimitiveRestartNV+   | GetPrimitiveRestartIndexNV    | GetActiveStencilFace    | GetArrayBufferBinding    | GetElementArrayBufferBinding@@ -433,388 +526,390 @@  marshalGetPName :: GetPName -> Maybe GLenum marshalGetPName x = case x of-   GetCurrentColor -> Just 0xb00-   GetCurrentIndex -> Just 0xb01-   GetCurrentNormal -> Just 0xb02-   GetCurrentTextureCoords -> Just 0xb03-   GetCurrentRasterColor -> Just 0xb04-   GetCurrentRasterSecondaryColor -> Just 0x845f-   GetCurrentRasterIndex -> Just 0xb05-   GetCurrentRasterTextureCoords -> Just 0xb06-   GetCurrentRasterPosition -> Just 0xb07-   GetCurrentRasterPositionValid -> Just 0xb08-   GetCurrentRasterDistance -> Just 0xb09-   GetCurrentMatrixIndex -> Just 0x8845-   GetPointSmooth -> Just 0xb10-   GetPointSize -> Just 0xb11-   GetPointSizeRange -> Just 0xb12-   GetPointSizeGranularity -> Just 0xb13-   GetLineSmooth -> Just 0xb20-   GetLineWidth -> Just 0xb21-   GetLineWidthRange -> Just 0xb22-   GetLineWidthGranularity -> Just 0xb23-   GetLineStipple -> Just 0xb24-   GetLineStipplePattern -> Just 0xb25-   GetLineStippleRepeat -> Just 0xb26-   GetSmoothPointSizeRange -> Just 0xb12-   GetSmoothPointSizeGranularity -> Just 0xb13-   GetSmoothLineWidthRange -> Just 0xb22-   GetSmoothLineWidthGranularity -> Just 0xb23-   GetAliasedPointSizeRange -> Just 0x846d-   GetAliasedLineWidthRange -> Just 0x846e-   GetListMode -> Just 0xb30-   GetMaxListNesting -> Just 0xb31-   GetListBase -> Just 0xb32-   GetListIndex -> Just 0xb33-   GetPolygonMode -> Just 0xb40-   GetPolygonSmooth -> Just 0xb41-   GetPolygonStipple -> Just 0xb42-   GetEdgeFlag -> Just 0xb43-   GetCullFace -> Just 0xb44-   GetCullFaceMode -> Just 0xb45-   GetFrontFace -> Just 0xb46-   GetLighting -> Just 0xb50-   GetLightModelLocalViewer -> Just 0xb51-   GetLightModelTwoSide -> Just 0xb52-   GetLightModelAmbient -> Just 0xb53-   GetShadeModel -> Just 0xb54-   GetColorMaterialFace -> Just 0xb55-   GetColorMaterialParameter -> Just 0xb56-   GetColorMaterial -> Just 0xb57-   GetFog -> Just 0xb60-   GetFogIndex -> Just 0xb61-   GetFogDensity -> Just 0xb62-   GetFogStart -> Just 0xb63-   GetFogEnd -> Just 0xb64-   GetFogMode -> Just 0xb65-   GetFogColor -> Just 0xb66-   GetFogCoordSrc -> Just 0x8450-   GetCurrentFogCoord -> Just 0x8453-   GetDepthRange -> Just 0xb70-   GetDepthTest -> Just 0xb71-   GetDepthWritemask -> Just 0xb72-   GetDepthClearValue -> Just 0xb73-   GetDepthFunc -> Just 0xb74-   GetAccumClearValue -> Just 0xb80-   GetStencilTest -> Just 0xb90-   GetStencilClearValue -> Just 0xb91-   GetStencilFunc -> Just 0xb92-   GetStencilValueMask -> Just 0xb93-   GetStencilFail -> Just 0xb94-   GetStencilPassDepthFail -> Just 0xb95-   GetStencilPassDepthPass -> Just 0xb96-   GetStencilRef -> Just 0xb97-   GetStencilWritemask -> Just 0xb98-   GetMatrixMode -> Just 0xba0-   GetNormalize -> Just 0xba1-   GetViewport -> Just 0xba2-   GetModelviewStackDepth -> Just 0xba3-   GetProjectionStackDepth -> Just 0xba4-   GetTextureStackDepth -> Just 0xba5-   GetModelviewMatrix -> Just 0xba6-   GetProjectionMatrix -> Just 0xba7-   GetTextureMatrix -> Just 0xba8-   GetAttribStackDepth -> Just 0xbb0-   GetClientAttribStackDepth -> Just 0xbb1-   GetAlphaTest -> Just 0xbc0-   GetAlphaTestFunc -> Just 0xbc1-   GetAlphaTestRef -> Just 0xbc2-   GetDither -> Just 0xbd0-   GetBlendDst -> Just 0xbe0-   GetBlendSrc -> Just 0xbe1-   GetBlend -> Just 0xbe2-   GetLogicOpMode -> Just 0xbf0-   GetIndexLogicOp -> Just 0xbf1-   GetLogicOp -> Just 0xbf1-   GetColorLogicOp -> Just 0xbf2-   GetAuxBuffers -> Just 0xc00-   GetDrawBuffer -> Just 0xc01-   GetReadBuffer -> Just 0xc02-   GetScissorBox -> Just 0xc10-   GetScissorTest -> Just 0xc11-   GetIndexClearValue -> Just 0xc20-   GetIndexWritemask -> Just 0xc21-   GetColorClearValue -> Just 0xc22-   GetColorWritemask -> Just 0xc23-   GetIndexMode -> Just 0xc30-   GetRGBAMode -> Just 0xc31-   GetDoublebuffer -> Just 0xc32-   GetStereo -> Just 0xc33-   GetRenderMode -> Just 0xc40-   GetPerspectiveCorrectionHint -> Just 0xc50-   GetPointSmoothHint -> Just 0xc51-   GetLineSmoothHint -> Just 0xc52-   GetPolygonSmoothHint -> Just 0xc53-   GetFogHint -> Just 0xc54-   GetGenerateMipmapHint -> Just 0x8192-   GetTextureCompressionHint -> Just 0x84ef-   GetTextureGenS -> Just 0xc60-   GetTextureGenT -> Just 0xc61-   GetTextureGenR -> Just 0xc62-   GetTextureGenQ -> Just 0xc63-   GetPixelMapIToISize -> Just 0xcb0-   GetPixelMapSToSSize -> Just 0xcb1-   GetPixelMapIToRSize -> Just 0xcb2-   GetPixelMapIToGSize -> Just 0xcb3-   GetPixelMapIToBSize -> Just 0xcb4-   GetPixelMapIToASize -> Just 0xcb5-   GetPixelMapRToRSize -> Just 0xcb6-   GetPixelMapGToGSize -> Just 0xcb7-   GetPixelMapBToBSize -> Just 0xcb8-   GetPixelMapAToASize -> Just 0xcb9-   GetUnpackSwapBytes -> Just 0xcf0-   GetUnpackLSBFirst -> Just 0xcf1-   GetUnpackRowLength -> Just 0xcf2-   GetUnpackSkipRows -> Just 0xcf3-   GetUnpackSkipPixels -> Just 0xcf4-   GetUnpackAlignment -> Just 0xcf5-   GetPackSwapBytes -> Just 0xd00-   GetPackLSBFirst -> Just 0xd01-   GetPackRowLength -> Just 0xd02-   GetPackSkipRows -> Just 0xd03-   GetPackSkipPixels -> Just 0xd04-   GetPackAlignment -> Just 0xd05-   GetMapColor -> Just 0xd10-   GetMapStencil -> Just 0xd11-   GetIndexShift -> Just 0xd12-   GetIndexOffset -> Just 0xd13-   GetRedScale -> Just 0xd14-   GetRedBias -> Just 0xd15-   GetZoomX -> Just 0xd16-   GetZoomY -> Just 0xd17-   GetGreenScale -> Just 0xd18-   GetGreenBias -> Just 0xd19-   GetBlueScale -> Just 0xd1a-   GetBlueBias -> Just 0xd1b-   GetAlphaScale -> Just 0xd1c-   GetAlphaBias -> Just 0xd1d-   GetDepthScale -> Just 0xd1e-   GetDepthBias -> Just 0xd1f-   GetMaxEvalOrder -> Just 0xd30-   GetMaxLights -> Just 0xd31-   GetMaxClipPlanes -> Just 0xd32-   GetMaxTextureSize -> Just 0xd33-   GetMaxPixelMapTable -> Just 0xd34-   GetMaxAttribStackDepth -> Just 0xd35-   GetMaxModelviewStackDepth -> Just 0xd36-   GetMaxNameStackDepth -> Just 0xd37-   GetMaxProjectionStackDepth -> Just 0xd38-   GetMaxTextureStackDepth -> Just 0xd39-   GetMaxViewportDims -> Just 0xd3a-   GetMaxClientAttribStackDepth -> Just 0xd3b-   GetSubpixelBits -> Just 0xd50-   GetIndexBits -> Just 0xd51-   GetRedBits -> Just 0xd52-   GetGreenBits -> Just 0xd53-   GetBlueBits -> Just 0xd54-   GetAlphaBits -> Just 0xd55-   GetDepthBits -> Just 0xd56-   GetStencilBits -> Just 0xd57-   GetAccumRedBits -> Just 0xd58-   GetAccumGreenBits -> Just 0xd59-   GetAccumBlueBits -> Just 0xd5a-   GetAccumAlphaBits -> Just 0xd5b-   GetNameStackDepth -> Just 0xd70-   GetAutoNormal -> Just 0xd80-   GetMap1Color4 -> Just 0xd90-   GetMap1Index -> Just 0xd91-   GetMap1Normal -> Just 0xd92-   GetMap1TextureCoord1 -> Just 0xd93-   GetMap1TextureCoord2 -> Just 0xd94-   GetMap1TextureCoord3 -> Just 0xd95-   GetMap1TextureCoord4 -> Just 0xd96-   GetMap1Vertex3 -> Just 0xd97-   GetMap1Vertex4 -> Just 0xd98-   GetMap2Color4 -> Just 0xdb0-   GetMap2Index -> Just 0xdb1-   GetMap2Normal -> Just 0xdb2-   GetMap2TextureCoord1 -> Just 0xdb3-   GetMap2TextureCoord2 -> Just 0xdb4-   GetMap2TextureCoord3 -> Just 0xdb5-   GetMap2TextureCoord4 -> Just 0xdb6-   GetMap2Vertex3 -> Just 0xdb7-   GetMap2Vertex4 -> Just 0xdb8-   GetMap1GridDomain -> Just 0xdd0-   GetMap1GridSegments -> Just 0xdd1-   GetMap2GridDomain -> Just 0xdd2-   GetMap2GridSegments -> Just 0xdd3-   GetTexture1D -> Just 0xde0-   GetTexture2D -> Just 0xde1-   GetFeedbackBufferSize -> Just 0xdf1-   GetFeedbackBufferType -> Just 0xdf2-   GetSelectionBufferSize -> Just 0xdf4-   GetPolygonOffsetUnits -> Just 0x2a00-   GetPolygonOffsetPoint -> Just 0x2a01-   GetPolygonOffsetLine -> Just 0x2a02-   GetPolygonOffsetFill -> Just 0x8037-   GetPolygonOffsetFactor -> Just 0x8038-   GetTextureBinding1D -> Just 0x8068-   GetTextureBinding2D -> Just 0x8069-   GetTextureBinding3D -> Just 0x806a-   GetVertexArray -> Just 0x8074-   GetNormalArray -> Just 0x8075-   GetColorArray -> Just 0x8076-   GetIndexArray -> Just 0x8077-   GetTextureCoordArray -> Just 0x8078-   GetEdgeFlagArray -> Just 0x8079-   GetFogCoordArray -> Just 0x8457-   GetSecondaryColorArray -> Just 0x845e-   GetMatrixIndexArray -> Just 0x8844-   GetVertexArraySize -> Just 0x807a-   GetVertexArrayType -> Just 0x807b-   GetVertexArrayStride -> Just 0x807c-   GetNormalArrayType -> Just 0x807e-   GetNormalArrayStride -> Just 0x807f-   GetColorArraySize -> Just 0x8081-   GetColorArrayType -> Just 0x8082-   GetColorArrayStride -> Just 0x8083-   GetIndexArrayType -> Just 0x8085-   GetIndexArrayStride -> Just 0x8086-   GetTextureCoordArraySize -> Just 0x8088-   GetTextureCoordArrayType -> Just 0x8089-   GetTextureCoordArrayStride -> Just 0x808a-   GetEdgeFlagArrayStride -> Just 0x808c-   GetFogCoordArrayType -> Just 0x8454-   GetFogCoordArrayStride -> Just 0x8455-   GetSecondaryColorArraySize -> Just 0x845a-   GetSecondaryColorArrayType -> Just 0x845b-   GetSecondaryColorArrayStride -> Just 0x845c-   GetMatrixIndexArraySize -> Just 0x8846-   GetMatrixIndexArrayType -> Just 0x8847-   GetMatrixIndexArrayStride -> Just 0x8848+   GetCurrentColor -> Just gl_CURRENT_COLOR+   GetCurrentIndex -> Just gl_CURRENT_INDEX+   GetCurrentNormal -> Just gl_CURRENT_NORMAL+   GetCurrentTextureCoords -> Just gl_CURRENT_TEXTURE_COORDS+   GetCurrentRasterColor -> Just gl_CURRENT_RASTER_COLOR+   GetCurrentRasterSecondaryColor -> Just gl_CURRENT_RASTER_SECONDARY_COLOR+   GetCurrentRasterIndex -> Just gl_CURRENT_RASTER_INDEX+   GetCurrentRasterTextureCoords -> Just gl_CURRENT_RASTER_TEXTURE_COORDS+   GetCurrentRasterPosition -> Just gl_CURRENT_RASTER_POSITION+   GetCurrentRasterPositionValid -> Just gl_CURRENT_RASTER_POSITION_VALID+   GetCurrentRasterDistance -> Just gl_CURRENT_RASTER_DISTANCE+   GetCurrentMatrixIndex -> Just gl_CURRENT_MATRIX_INDEX+   GetPointSmooth -> Just gl_POINT_SMOOTH+   GetPointSize -> Just gl_POINT_SIZE+   GetPointSizeRange -> Just gl_POINT_SIZE_RANGE+   GetPointSizeGranularity -> Just gl_POINT_SIZE_GRANULARITY+   GetLineSmooth -> Just gl_LINE_SMOOTH+   GetLineWidth -> Just gl_LINE_WIDTH+   GetLineWidthRange -> Just gl_SMOOTH_LINE_WIDTH_RANGE+   GetLineWidthGranularity -> Just gl_SMOOTH_LINE_WIDTH_GRANULARITY+   GetLineStipple -> Just gl_LINE_STIPPLE+   GetLineStipplePattern -> Just gl_LINE_STIPPLE_PATTERN+   GetLineStippleRepeat -> Just gl_LINE_STIPPLE_REPEAT+   GetSmoothPointSizeRange -> Just gl_POINT_SIZE_RANGE+   GetSmoothPointSizeGranularity -> Just gl_POINT_SIZE_GRANULARITY+   GetSmoothLineWidthRange -> Just gl_SMOOTH_LINE_WIDTH_RANGE+   GetSmoothLineWidthGranularity -> Just gl_SMOOTH_LINE_WIDTH_GRANULARITY+   GetAliasedPointSizeRange -> Just gl_ALIASED_POINT_SIZE_RANGE+   GetAliasedLineWidthRange -> Just gl_ALIASED_LINE_WIDTH_RANGE+   GetListMode -> Just gl_LIST_MODE+   GetMaxListNesting -> Just gl_MAX_LIST_NESTING+   GetListBase -> Just gl_LIST_BASE+   GetListIndex -> Just gl_LIST_INDEX+   GetPolygonMode -> Just gl_POLYGON_MODE+   GetPolygonSmooth -> Just gl_POLYGON_SMOOTH+   GetPolygonStipple -> Just gl_POLYGON_STIPPLE+   GetEdgeFlag -> Just gl_EDGE_FLAG+   GetCullFace -> Just gl_CULL_FACE+   GetCullFaceMode -> Just gl_CULL_FACE_MODE+   GetFrontFace -> Just gl_FRONT_FACE+   GetLighting -> Just gl_LIGHTING+   GetLightModelLocalViewer -> Just gl_LIGHT_MODEL_LOCAL_VIEWER+   GetLightModelTwoSide -> Just gl_LIGHT_MODEL_TWO_SIDE+   GetLightModelAmbient -> Just gl_LIGHT_MODEL_AMBIENT+   GetShadeModel -> Just gl_SHADE_MODEL+   GetColorMaterialFace -> Just gl_COLOR_MATERIAL_FACE+   GetColorMaterialParameter -> Just gl_COLOR_MATERIAL_PARAMETER+   GetColorMaterial -> Just gl_COLOR_MATERIAL+   GetFog -> Just gl_FOG+   GetFogIndex -> Just gl_FOG_INDEX+   GetFogDensity -> Just gl_FOG_DENSITY+   GetFogStart -> Just gl_FOG_START+   GetFogEnd -> Just gl_FOG_END+   GetFogMode -> Just gl_FOG_MODE+   GetFogColor -> Just gl_FOG_COLOR+   GetFogCoordSrc -> Just gl_FOG_COORD_SRC+   GetCurrentFogCoord -> Just gl_CURRENT_FOG_COORD+   GetDepthRange -> Just gl_DEPTH_RANGE+   GetDepthTest -> Just gl_DEPTH_TEST+   GetDepthWritemask -> Just gl_DEPTH_WRITEMASK+   GetDepthClearValue -> Just gl_DEPTH_CLEAR_VALUE+   GetDepthFunc -> Just gl_DEPTH_FUNC+   GetAccumClearValue -> Just gl_ACCUM_CLEAR_VALUE+   GetStencilTest -> Just gl_STENCIL_TEST+   GetStencilClearValue -> Just gl_STENCIL_CLEAR_VALUE+   GetStencilFunc -> Just gl_STENCIL_FUNC+   GetStencilValueMask -> Just gl_STENCIL_VALUE_MASK+   GetStencilFail -> Just gl_STENCIL_FAIL+   GetStencilPassDepthFail -> Just gl_STENCIL_PASS_DEPTH_FAIL+   GetStencilPassDepthPass -> Just gl_STENCIL_PASS_DEPTH_PASS+   GetStencilRef -> Just gl_STENCIL_REF+   GetStencilWritemask -> Just gl_STENCIL_WRITEMASK+   GetMatrixMode -> Just gl_MATRIX_MODE+   GetNormalize -> Just gl_NORMALIZE+   GetViewport -> Just gl_VIEWPORT+   GetModelviewStackDepth -> Just gl_MODELVIEW_STACK_DEPTH+   GetProjectionStackDepth -> Just gl_PROJECTION_STACK_DEPTH+   GetTextureStackDepth -> Just gl_TEXTURE_STACK_DEPTH+   GetModelviewMatrix -> Just gl_MODELVIEW_MATRIX+   GetProjectionMatrix -> Just gl_PROJECTION_MATRIX+   GetTextureMatrix -> Just gl_TEXTURE_MATRIX+   GetAttribStackDepth -> Just gl_ATTRIB_STACK_DEPTH+   GetClientAttribStackDepth -> Just gl_CLIENT_ATTRIB_STACK_DEPTH+   GetAlphaTest -> Just gl_ALPHA_TEST+   GetAlphaTestFunc -> Just gl_ALPHA_TEST_FUNC+   GetAlphaTestRef -> Just gl_ALPHA_TEST_REF+   GetDither -> Just gl_DITHER+   GetBlendDst -> Just gl_BLEND_DST+   GetBlendSrc -> Just gl_BLEND_SRC+   GetBlend -> Just gl_BLEND+   GetLogicOpMode -> Just gl_LOGIC_OP_MODE+   GetIndexLogicOp -> Just gl_INDEX_LOGIC_OP+   GetLogicOp -> Just gl_INDEX_LOGIC_OP+   GetColorLogicOp -> Just gl_COLOR_LOGIC_OP+   GetAuxBuffers -> Just gl_AUX_BUFFERS+   GetDrawBuffer -> Just gl_DRAW_BUFFER+   GetReadBuffer -> Just gl_READ_BUFFER+   GetScissorBox -> Just gl_SCISSOR_BOX+   GetScissorTest -> Just gl_SCISSOR_TEST+   GetIndexClearValue -> Just gl_INDEX_CLEAR_VALUE+   GetIndexWritemask -> Just gl_INDEX_WRITEMASK+   GetColorClearValue -> Just gl_COLOR_CLEAR_VALUE+   GetColorWritemask -> Just gl_COLOR_WRITEMASK+   GetIndexMode -> Just gl_INDEX_MODE+   GetRGBAMode -> Just gl_RGBA_MODE+   GetDoublebuffer -> Just gl_DOUBLEBUFFER+   GetStereo -> Just gl_STEREO+   GetRenderMode -> Just gl_RENDER_MODE+   GetPerspectiveCorrectionHint -> Just gl_PERSPECTIVE_CORRECTION_HINT+   GetPointSmoothHint -> Just gl_POINT_SMOOTH_HINT+   GetLineSmoothHint -> Just gl_LINE_SMOOTH_HINT+   GetPolygonSmoothHint -> Just gl_POLYGON_SMOOTH_HINT+   GetFogHint -> Just gl_FOG_HINT+   GetGenerateMipmapHint -> Just gl_GENERATE_MIPMAP_HINT+   GetTextureCompressionHint -> Just gl_TEXTURE_COMPRESSION_HINT+   GetTextureGenS -> Just gl_TEXTURE_GEN_S+   GetTextureGenT -> Just gl_TEXTURE_GEN_T+   GetTextureGenR -> Just gl_TEXTURE_GEN_R+   GetTextureGenQ -> Just gl_TEXTURE_GEN_Q+   GetPixelMapIToISize -> Just gl_PIXEL_MAP_I_TO_I_SIZE+   GetPixelMapSToSSize -> Just gl_PIXEL_MAP_S_TO_S_SIZE+   GetPixelMapIToRSize -> Just gl_PIXEL_MAP_I_TO_R_SIZE+   GetPixelMapIToGSize -> Just gl_PIXEL_MAP_I_TO_G_SIZE+   GetPixelMapIToBSize -> Just gl_PIXEL_MAP_I_TO_B_SIZE+   GetPixelMapIToASize -> Just gl_PIXEL_MAP_I_TO_A_SIZE+   GetPixelMapRToRSize -> Just gl_PIXEL_MAP_R_TO_R_SIZE+   GetPixelMapGToGSize -> Just gl_PIXEL_MAP_G_TO_G_SIZE+   GetPixelMapBToBSize -> Just gl_PIXEL_MAP_B_TO_B_SIZE+   GetPixelMapAToASize -> Just gl_PIXEL_MAP_A_TO_A_SIZE+   GetUnpackSwapBytes -> Just gl_UNPACK_SWAP_BYTES+   GetUnpackLSBFirst -> Just gl_UNPACK_LSB_FIRST+   GetUnpackRowLength -> Just gl_UNPACK_ROW_LENGTH+   GetUnpackSkipRows -> Just gl_UNPACK_SKIP_ROWS+   GetUnpackSkipPixels -> Just gl_UNPACK_SKIP_PIXELS+   GetUnpackAlignment -> Just gl_UNPACK_ALIGNMENT+   GetPackSwapBytes -> Just gl_PACK_SWAP_BYTES+   GetPackLSBFirst -> Just gl_PACK_LSB_FIRST+   GetPackRowLength -> Just gl_PACK_ROW_LENGTH+   GetPackSkipRows -> Just gl_PACK_SKIP_ROWS+   GetPackSkipPixels -> Just gl_PACK_SKIP_PIXELS+   GetPackAlignment -> Just gl_PACK_ALIGNMENT+   GetMapColor -> Just gl_MAP_COLOR+   GetMapStencil -> Just gl_MAP_STENCIL+   GetIndexShift -> Just gl_INDEX_SHIFT+   GetIndexOffset -> Just gl_INDEX_OFFSET+   GetRedScale -> Just gl_RED_SCALE+   GetRedBias -> Just gl_RED_BIAS+   GetZoomX -> Just gl_ZOOM_X+   GetZoomY -> Just gl_ZOOM_Y+   GetGreenScale -> Just gl_GREEN_SCALE+   GetGreenBias -> Just gl_GREEN_BIAS+   GetBlueScale -> Just gl_BLUE_SCALE+   GetBlueBias -> Just gl_BLUE_BIAS+   GetAlphaScale -> Just gl_ALPHA_SCALE+   GetAlphaBias -> Just gl_ALPHA_BIAS+   GetDepthScale -> Just gl_DEPTH_SCALE+   GetDepthBias -> Just gl_DEPTH_BIAS+   GetMaxEvalOrder -> Just gl_MAX_EVAL_ORDER+   GetMaxLights -> Just gl_MAX_LIGHTS+   GetMaxClipPlanes -> Just gl_MAX_CLIP_DISTANCES+   GetMaxTextureSize -> Just gl_MAX_TEXTURE_SIZE+   GetMaxPixelMapTable -> Just gl_MAX_PIXEL_MAP_TABLE+   GetMaxAttribStackDepth -> Just gl_MAX_ATTRIB_STACK_DEPTH+   GetMaxModelviewStackDepth -> Just gl_MAX_MODELVIEW_STACK_DEPTH+   GetMaxNameStackDepth -> Just gl_MAX_NAME_STACK_DEPTH+   GetMaxProjectionStackDepth -> Just gl_MAX_PROJECTION_STACK_DEPTH+   GetMaxTextureStackDepth -> Just gl_MAX_TEXTURE_STACK_DEPTH+   GetMaxViewportDims -> Just gl_MAX_VIEWPORT_DIMS+   GetMaxClientAttribStackDepth -> Just gl_MAX_CLIENT_ATTRIB_STACK_DEPTH+   GetSubpixelBits -> Just gl_SUBPIXEL_BITS+   GetIndexBits -> Just gl_INDEX_BITS+   GetRedBits -> Just gl_RED_BITS+   GetGreenBits -> Just gl_GREEN_BITS+   GetBlueBits -> Just gl_BLUE_BITS+   GetAlphaBits -> Just gl_ALPHA_BITS+   GetDepthBits -> Just gl_DEPTH_BITS+   GetStencilBits -> Just gl_STENCIL_BITS+   GetAccumRedBits -> Just gl_ACCUM_RED_BITS+   GetAccumGreenBits -> Just gl_ACCUM_GREEN_BITS+   GetAccumBlueBits -> Just gl_ACCUM_BLUE_BITS+   GetAccumAlphaBits -> Just gl_ACCUM_ALPHA_BITS+   GetNameStackDepth -> Just gl_NAME_STACK_DEPTH+   GetAutoNormal -> Just gl_AUTO_NORMAL+   GetMap1Color4 -> Just gl_MAP1_COLOR_4+   GetMap1Index -> Just gl_MAP1_INDEX+   GetMap1Normal -> Just gl_MAP1_NORMAL+   GetMap1TextureCoord1 -> Just gl_MAP1_TEXTURE_COORD_1+   GetMap1TextureCoord2 -> Just gl_MAP1_TEXTURE_COORD_2+   GetMap1TextureCoord3 -> Just gl_MAP1_TEXTURE_COORD_3+   GetMap1TextureCoord4 -> Just gl_MAP1_TEXTURE_COORD_4+   GetMap1Vertex3 -> Just gl_MAP1_VERTEX_3+   GetMap1Vertex4 -> Just gl_MAP1_VERTEX_4+   GetMap2Color4 -> Just gl_MAP2_COLOR_4+   GetMap2Index -> Just gl_MAP2_INDEX+   GetMap2Normal -> Just gl_MAP2_NORMAL+   GetMap2TextureCoord1 -> Just gl_MAP2_TEXTURE_COORD_1+   GetMap2TextureCoord2 -> Just gl_MAP2_TEXTURE_COORD_2+   GetMap2TextureCoord3 -> Just gl_MAP2_TEXTURE_COORD_3+   GetMap2TextureCoord4 -> Just gl_MAP2_TEXTURE_COORD_4+   GetMap2Vertex3 -> Just gl_MAP2_VERTEX_3+   GetMap2Vertex4 -> Just gl_MAP2_VERTEX_4+   GetMap1GridDomain -> Just gl_MAP1_GRID_DOMAIN+   GetMap1GridSegments -> Just gl_MAP1_GRID_SEGMENTS+   GetMap2GridDomain -> Just gl_MAP2_GRID_DOMAIN+   GetMap2GridSegments -> Just gl_MAP2_GRID_SEGMENTS+   GetTexture1D -> Just gl_TEXTURE_1D+   GetTexture2D -> Just gl_TEXTURE_2D+   GetFeedbackBufferSize -> Just gl_FEEDBACK_BUFFER_SIZE+   GetFeedbackBufferType -> Just gl_FEEDBACK_BUFFER_TYPE+   GetSelectionBufferSize -> Just gl_SELECTION_BUFFER_SIZE+   GetPolygonOffsetUnits -> Just gl_POLYGON_OFFSET_UNITS+   GetPolygonOffsetPoint -> Just gl_POLYGON_OFFSET_POINT+   GetPolygonOffsetLine -> Just gl_POLYGON_OFFSET_LINE+   GetPolygonOffsetFill -> Just gl_POLYGON_OFFSET_FILL+   GetPolygonOffsetFactor -> Just gl_POLYGON_OFFSET_FACTOR+   GetTextureBinding1D -> Just gl_TEXTURE_BINDING_1D+   GetTextureBinding2D -> Just gl_TEXTURE_BINDING_2D+   GetTextureBinding3D -> Just gl_TEXTURE_BINDING_3D+   GetVertexArray -> Just gl_VERTEX_ARRAY+   GetNormalArray -> Just gl_NORMAL_ARRAY+   GetColorArray -> Just gl_COLOR_ARRAY+   GetIndexArray -> Just gl_INDEX_ARRAY+   GetTextureCoordArray -> Just gl_TEXTURE_COORD_ARRAY+   GetEdgeFlagArray -> Just gl_EDGE_FLAG_ARRAY+   GetFogCoordArray -> Just gl_FOG_COORD_ARRAY+   GetSecondaryColorArray -> Just gl_SECONDARY_COLOR_ARRAY+   GetMatrixIndexArray -> Just gl_MATRIX_INDEX_ARRAY+   GetVertexArraySize -> Just gl_VERTEX_ARRAY_SIZE+   GetVertexArrayType -> Just gl_VERTEX_ARRAY_TYPE+   GetVertexArrayStride -> Just gl_VERTEX_ARRAY_STRIDE+   GetNormalArrayType -> Just gl_NORMAL_ARRAY_TYPE+   GetNormalArrayStride -> Just gl_NORMAL_ARRAY_STRIDE+   GetColorArraySize -> Just gl_COLOR_ARRAY_SIZE+   GetColorArrayType -> Just gl_COLOR_ARRAY_TYPE+   GetColorArrayStride -> Just gl_COLOR_ARRAY_STRIDE+   GetIndexArrayType -> Just gl_INDEX_ARRAY_TYPE+   GetIndexArrayStride -> Just gl_INDEX_ARRAY_STRIDE+   GetTextureCoordArraySize -> Just gl_TEXTURE_COORD_ARRAY_SIZE+   GetTextureCoordArrayType -> Just gl_TEXTURE_COORD_ARRAY_TYPE+   GetTextureCoordArrayStride -> Just gl_TEXTURE_COORD_ARRAY_STRIDE+   GetEdgeFlagArrayStride -> Just gl_EDGE_FLAG_ARRAY_STRIDE+   GetFogCoordArrayType -> Just gl_FOG_COORD_ARRAY_TYPE+   GetFogCoordArrayStride -> Just gl_FOG_COORD_ARRAY_STRIDE+   GetSecondaryColorArraySize -> Just gl_SECONDARY_COLOR_ARRAY_SIZE+   GetSecondaryColorArrayType -> Just gl_SECONDARY_COLOR_ARRAY_TYPE+   GetSecondaryColorArrayStride -> Just gl_SECONDARY_COLOR_ARRAY_STRIDE+   GetMatrixIndexArraySize -> Just gl_MATRIX_INDEX_ARRAY_SIZE+   GetMatrixIndexArrayType -> Just gl_MATRIX_INDEX_ARRAY_TYPE+   GetMatrixIndexArrayStride -> Just gl_MATRIX_INDEX_ARRAY_STRIDE    GetClipPlane i -> clipPlaneIndexToEnum i    GetLight i -> lightIndexToEnum i-   GetTransposeModelviewMatrix -> Just 0x84e3-   GetTransposeProjectionMatrix -> Just 0x84e4-   GetTransposeTextureMatrix -> Just 0x84e5-   GetTransposeColorMatrix -> Just 0x84e6-   GetLightModelColorControl -> Just 0x81f8-   GetBlendColor -> Just 0x8005-   GetBlendEquation -> Just 0x8009-   GetBlendEquationAlpha -> Just 0x883d-   GetColorTable -> Just 0x80d0-   GetPostConvolutionColorTable -> Just 0x80d1-   GetPostColorMatrixColorTable -> Just 0x80d2-   GetConvolution1D -> Just 0x8010-   GetConvolution2D -> Just 0x8011-   GetSeparable2D -> Just 0x8012-   GetMaxConvolutionWidth -> Just 0x801a-   GetMaxConvolutionHeight -> Just 0x801b-   GetPostConvolutionRedScale -> Just 0x801c-   GetPostConvolutionGreenScale -> Just 0x801d-   GetPostConvolutionBlueScale -> Just 0x801e-   GetPostConvolutionAlphaScale -> Just 0x801f-   GetPostConvolutionRedBias -> Just 0x8020-   GetPostConvolutionGreenBias -> Just 0x8021-   GetPostConvolutionBlueBias -> Just 0x8022-   GetPostConvolutionAlphaBias -> Just 0x8023-   GetHistogram -> Just 0x8024-   GetMinmax -> Just 0x802e-   GetColorSum -> Just 0x8458-   GetCurrentSecondaryColor -> Just 0x8459-   GetRescaleNormal -> Just 0x803a-   GetSharedTexturePalette -> Just 0x81fb-   GetTexture3DBinding -> Just 0x806a-   GetPackSkipImages -> Just 0x806b-   GetPackImageHeight -> Just 0x806c-   GetUnpackSkipImages -> Just 0x806d-   GetUnpackImageHeight -> Just 0x806e-   GetTexture3D -> Just 0x806f-   GetMax3DTextureSize -> Just 0x8073-   GetMaxTextureLODBias -> Just 0x84fd-   GetMaxTextureMaxAnisotropy -> Just 0x84ff-   GetMultisample -> Just 0x809d-   GetSampleAlphaToCoverage -> Just 0x809e-   GetSampleAlphaToOne -> Just 0x809f-   GetSampleCoverage -> Just 0x80a0-   GetSampleBuffers -> Just 0x80a8-   GetSamples -> Just 0x80a9-   GetSampleCoverageValue -> Just 0x80aa-   GetSampleCoverageInvert -> Just 0x80ab-   GetPointSizeMin -> Just 0x8126-   GetPointSizeMax -> Just 0x8127-   GetPointFadeThresholdSize -> Just 0x8128-   GetPointDistanceAttenuation -> Just 0x8129-   GetColorMatrix -> Just 0x80b1-   GetColorMatrixStackDepth -> Just 0x80b2-   GetMaxColorMatrixStackDepth -> Just 0x80b3-   GetPostColorMatrixRedScale -> Just 0x80b4-   GetPostColorMatrixGreenScale -> Just 0x80b5-   GetPostColorMatrixBlueScale -> Just 0x80b6-   GetPostColorMatrixAlphaScale -> Just 0x80b7-   GetPostColorMatrixRedBias -> Just 0x80b8-   GetPostColorMatrixGreenBias -> Just 0x80b9-   GetPostColorMatrixBlueBias -> Just 0x80ba-   GetPostColorMatrixAlphaBias -> Just 0x80bb-   GetMaxElementsVertices -> Just 0x80e8-   GetMaxElementsIndices -> Just 0x80e9-   GetActiveTexture -> Just 0x84e0-   GetClientActiveTexture -> Just 0x84e1-   GetMaxTextureUnits -> Just 0x84e2-   GetTextureCubeMap -> Just 0x8513-   GetMaxCubeMapTextureSize -> Just 0x851c-   GetMaxRectangleTextureSize -> Just 0x84F8-   GetNumCompressedTextureFormats -> Just 0x86a2-   GetCompressedTextureFormats -> Just 0x86a3-   GetMaxVertexUnits -> Just 0x86a4-   GetActiveVertexUnits -> Just 0x86a5-   GetWeightSumUnity -> Just 0x86a6-   GetVertexBlend -> Just 0x86a7+   GetTransposeModelviewMatrix -> Just gl_TRANSPOSE_MODELVIEW_MATRIX+   GetTransposeProjectionMatrix -> Just gl_TRANSPOSE_PROJECTION_MATRIX+   GetTransposeTextureMatrix -> Just gl_TRANSPOSE_TEXTURE_MATRIX+   GetTransposeColorMatrix -> Just gl_TRANSPOSE_COLOR_MATRIX+   GetLightModelColorControl -> Just gl_LIGHT_MODEL_COLOR_CONTROL+   GetBlendColor -> Just gl_BLEND_COLOR+   GetBlendEquation -> Just gl_BLEND_EQUATION_RGB+   GetBlendEquationAlpha -> Just gl_BLEND_EQUATION_ALPHA+   GetColorTable -> Just gl_COLOR_TABLE+   GetPostConvolutionColorTable -> Just gl_POST_CONVOLUTION_COLOR_TABLE+   GetPostColorMatrixColorTable -> Just gl_POST_COLOR_MATRIX_COLOR_TABLE+   GetConvolution1D -> Just gl_CONVOLUTION_1D+   GetConvolution2D -> Just gl_CONVOLUTION_2D+   GetSeparable2D -> Just gl_SEPARABLE_2D+   GetMaxConvolutionWidth -> Just gl_MAX_CONVOLUTION_WIDTH+   GetMaxConvolutionHeight -> Just gl_MAX_CONVOLUTION_HEIGHT+   GetPostConvolutionRedScale -> Just gl_POST_CONVOLUTION_RED_SCALE+   GetPostConvolutionGreenScale -> Just gl_POST_CONVOLUTION_GREEN_SCALE+   GetPostConvolutionBlueScale -> Just gl_POST_CONVOLUTION_BLUE_SCALE+   GetPostConvolutionAlphaScale -> Just gl_POST_CONVOLUTION_ALPHA_SCALE+   GetPostConvolutionRedBias -> Just gl_POST_CONVOLUTION_RED_BIAS+   GetPostConvolutionGreenBias -> Just gl_POST_CONVOLUTION_GREEN_BIAS+   GetPostConvolutionBlueBias -> Just gl_POST_CONVOLUTION_BLUE_BIAS+   GetPostConvolutionAlphaBias -> Just gl_POST_CONVOLUTION_ALPHA_BIAS+   GetHistogram -> Just gl_HISTOGRAM+   GetMinmax -> Just gl_MINMAX+   GetColorSum -> Just gl_COLOR_SUM+   GetCurrentSecondaryColor -> Just gl_CURRENT_SECONDARY_COLOR+   GetRescaleNormal -> Just gl_RESCALE_NORMAL+   GetSharedTexturePalette -> Just gl_SHARED_TEXTURE_PALETTE+   GetTexture3DBinding -> Just gl_TEXTURE_BINDING_3D+   GetPackSkipImages -> Just gl_PACK_SKIP_IMAGES+   GetPackImageHeight -> Just gl_PACK_IMAGE_HEIGHT+   GetUnpackSkipImages -> Just gl_UNPACK_SKIP_IMAGES+   GetUnpackImageHeight -> Just gl_UNPACK_IMAGE_HEIGHT+   GetTexture3D -> Just gl_TEXTURE_3D+   GetMax3DTextureSize -> Just gl_MAX_3D_TEXTURE_SIZE+   GetMaxTextureLODBias -> Just gl_MAX_TEXTURE_LOD_BIAS+   GetMaxTextureMaxAnisotropy -> Just gl_MAX_TEXTURE_MAX_ANISOTROPY+   GetMultisample -> Just gl_MULTISAMPLE+   GetSampleAlphaToCoverage -> Just gl_SAMPLE_ALPHA_TO_COVERAGE+   GetSampleAlphaToOne -> Just gl_SAMPLE_ALPHA_TO_ONE+   GetSampleCoverage -> Just gl_SAMPLE_COVERAGE+   GetSampleBuffers -> Just gl_SAMPLE_BUFFERS+   GetSamples -> Just gl_SAMPLES+   GetSampleCoverageValue -> Just gl_SAMPLE_COVERAGE_VALUE+   GetSampleCoverageInvert -> Just gl_SAMPLE_COVERAGE_INVERT+   GetPointSizeMin -> Just gl_POINT_SIZE_MIN+   GetPointSizeMax -> Just gl_POINT_SIZE_MAX+   GetPointFadeThresholdSize -> Just gl_POINT_FADE_THRESHOLD_SIZE+   GetPointDistanceAttenuation -> Just gl_POINT_DISTANCE_ATTENUATION+   GetColorMatrix -> Just gl_COLOR_MATRIX+   GetColorMatrixStackDepth -> Just gl_COLOR_MATRIX_STACK_DEPTH+   GetMaxColorMatrixStackDepth -> Just gl_MAX_COLOR_MATRIX_STACK_DEPTH+   GetPostColorMatrixRedScale -> Just gl_POST_COLOR_MATRIX_RED_SCALE+   GetPostColorMatrixGreenScale -> Just gl_POST_COLOR_MATRIX_GREEN_SCALE+   GetPostColorMatrixBlueScale -> Just gl_POST_COLOR_MATRIX_BLUE_SCALE+   GetPostColorMatrixAlphaScale -> Just gl_POST_COLOR_MATRIX_ALPHA_SCALE+   GetPostColorMatrixRedBias -> Just gl_POST_COLOR_MATRIX_RED_BIAS+   GetPostColorMatrixGreenBias -> Just gl_POST_COLOR_MATRIX_GREEN_BIAS+   GetPostColorMatrixBlueBias -> Just gl_POST_COLOR_MATRIX_BLUE_BIAS+   GetPostColorMatrixAlphaBias -> Just gl_POST_COLOR_MATRIX_ALPHA_BIAS+   GetMaxElementsVertices -> Just gl_MAX_ELEMENTS_VERTICES+   GetMaxElementsIndices -> Just gl_MAX_ELEMENTS_INDICES+   GetActiveTexture -> Just gl_ACTIVE_TEXTURE+   GetClientActiveTexture -> Just gl_CLIENT_ACTIVE_TEXTURE+   GetMaxTextureUnits -> Just gl_MAX_TEXTURE_UNITS+   GetTextureCubeMap -> Just gl_TEXTURE_CUBE_MAP+   GetMaxCubeMapTextureSize -> Just gl_MAX_CUBE_MAP_TEXTURE_SIZE+   GetMaxRectangleTextureSize -> Just gl_MAX_RECTANGLE_TEXTURE_SIZE+   GetNumCompressedTextureFormats -> Just gl_NUM_COMPRESSED_TEXTURE_FORMATS+   GetCompressedTextureFormats -> Just gl_COMPRESSED_TEXTURE_FORMATS+   GetMaxVertexUnits -> Just gl_MAX_VERTEX_UNITS+   GetActiveVertexUnits -> Just gl_ACTIVE_VERTEX_UNITS+   GetWeightSumUnity -> Just gl_WEIGHT_SUM_UNITY+   GetVertexBlend -> Just gl_VERTEX_BLEND    GetModelview i -> modelviewIndexToEnum i-   GetCurrentWeight -> Just 0x86a8-   GetWeightArrayType -> Just 0x86a9-   GetWeightArrayStride -> Just 0x86aa-   GetWeightArraySize -> Just 0x86ab-   GetWeightArray -> Just 0x86ad-   GetMatrixPalette -> Just 0x8840-   GetMaxMatrixPaletteStackDepth -> Just 0x8841-   GetMaxPaletteMatrices -> Just 0x8842-   GetCurrentPaletteMatrix -> Just 0x8843-   GetBlendDstRGB -> Just 0x80c8-   GetBlendSrcRGB -> Just 0x80c9-   GetBlendDstAlpha -> Just 0x80ca-   GetBlendSrcAlpha -> Just 0x80cb-   GetPackCMYKHint -> Just 0x800e-   GetUnpackCMYKHint -> Just 0x800f-   GetArrayElementLockFirst -> Just 0x81a8-   GetArrayElementLockCount -> Just 0x81a9-   GetMaxShininess -> Just 0x8504-   GetMaxSpotExponent -> Just 0x8505-   GetFogDistanceMode -> Just 0x855a-   GetDepthBounds -> Just 0x8891-   GetPrimitiveRestartIndex -> Just 0x8559-   GetActiveStencilFace -> Just 0x8911-   GetArrayBufferBinding -> Just 0x8894-   GetElementArrayBufferBinding -> Just 0x8895-   GetVertexArrayBufferBinding -> Just 0x8896-   GetNormalArrayBufferBinding -> Just 0x8897-   GetColorArrayBufferBinding -> Just 0x8898-   GetIndexArrayBufferBinding -> Just 0x8899-   GetTextureCoordArrayBufferBinding -> Just 0x889a-   GetEdgeFlagArrayBufferBinding -> Just 0x889b-   GetSecondaryColorArrayBufferBinding -> Just 0x889c-   GetFogCoordArrayBufferBinding -> Just 0x889d-   GetTextureBindingCubeMap -> Just 0x8514-   GetTextureBindingRectangle -> Just 0x84f6-   GetCurrentMatrix -> Just 0x8641-   GetCurrentMatrixStackDepth -> Just 0x8640-   GetMaxCombinedTextureImageUnits -> Just 0x8b4d-   GetMaxDrawBuffers -> Just 0x8824-   GetMaxFragmentUniformComponents -> Just 0x8b49-   GetMaxTextureCoords -> Just 0x8871-   GetMaxTextureImageUnits -> Just 0x8872-   GetMaxVaryingFloats -> Just 0x8b4b-   GetMaxVertexAttribs -> Just 0x8869-   GetMaxVertexTextureImageUnits -> Just 0x8b4c-   GetMaxVertexUniformComponents -> Just 0x8b4a-   GetCurrentProgram -> Just 0x8b8d-   GetPixelPackBufferBinding -> Just 0x88ed-   GetPixelUnpackBufferBinding -> Just 0x88EF+   GetCurrentWeight -> Just gl_CURRENT_WEIGHT+   GetWeightArrayType -> Just gl_WEIGHT_ARRAY_TYPE+   GetWeightArrayStride -> Just gl_WEIGHT_ARRAY_STRIDE+   GetWeightArraySize -> Just gl_WEIGHT_ARRAY_SIZE+   GetWeightArray -> Just gl_WEIGHT_ARRAY+   GetMatrixPalette -> Just gl_MATRIX_PALETTE+   GetMaxMatrixPaletteStackDepth -> Just gl_MAX_MATRIX_PALETTE_STACK_DEPTH+   GetMaxPaletteMatrices -> Just gl_MAX_PALETTE_MATRICES+   GetCurrentPaletteMatrix -> Just gl_CURRENT_PALETTE_MATRIX+   GetBlendDstRGB -> Just gl_BLEND_DST_RGB+   GetBlendSrcRGB -> Just gl_BLEND_SRC_RGB+   GetBlendDstAlpha -> Just gl_BLEND_DST_ALPHA+   GetBlendSrcAlpha -> Just gl_BLEND_SRC_ALPHA+   GetPackCMYKHint -> Just gl_PACK_CMYK_HINT+   GetUnpackCMYKHint -> Just gl_UNPACK_CMYK_HINT+   GetArrayElementLockFirst -> Just gl_ARRAY_ELEMENT_LOCK_FIRST+   GetArrayElementLockCount -> Just gl_ARRAY_ELEMENT_LOCK_COUNT+   GetMaxShininess -> Just gl_MAX_SHININESS+   GetMaxSpotExponent -> Just gl_MAX_SPOT_EXPONENT+   GetFogDistanceMode -> Just gl_FOG_DISTANCE_MODE+   GetDepthBounds -> Just gl_DEPTH_BOUNDS+   GetPrimitiveRestartIndex -> Just gl_PRIMITIVE_RESTART_INDEX+   GetPrimitiveRestartNV -> Just gl_PRIMITIVE_RESTART_NV+   GetPrimitiveRestartIndexNV -> Just gl_PRIMITIVE_RESTART_INDEX_NV+   GetActiveStencilFace -> Just gl_ACTIVE_STENCIL_FACE+   GetArrayBufferBinding -> Just gl_ARRAY_BUFFER_BINDING+   GetElementArrayBufferBinding -> Just gl_ELEMENT_ARRAY_BUFFER_BINDING+   GetVertexArrayBufferBinding -> Just gl_VERTEX_ARRAY_BUFFER_BINDING+   GetNormalArrayBufferBinding -> Just gl_NORMAL_ARRAY_BUFFER_BINDING+   GetColorArrayBufferBinding -> Just gl_COLOR_ARRAY_BUFFER_BINDING+   GetIndexArrayBufferBinding -> Just gl_INDEX_ARRAY_BUFFER_BINDING+   GetTextureCoordArrayBufferBinding -> Just gl_TEXTURE_COORD_ARRAY_BUFFER_BINDING+   GetEdgeFlagArrayBufferBinding -> Just gl_EDGE_FLAG_ARRAY_BUFFER_BINDING+   GetSecondaryColorArrayBufferBinding -> Just gl_SECONDARY_COLOR_ARRAY_BUFFER_BINDING+   GetFogCoordArrayBufferBinding -> Just gl_FOG_COORD_ARRAY_BUFFER_BINDING+   GetTextureBindingCubeMap -> Just gl_TEXTURE_BINDING_CUBE_MAP+   GetTextureBindingRectangle -> Just gl_TEXTURE_BINDING_RECTANGLE+   GetCurrentMatrix -> Just gl_CURRENT_MATRIX+   GetCurrentMatrixStackDepth -> Just gl_CURRENT_MATRIX_STACK_DEPTH+   GetMaxCombinedTextureImageUnits -> Just gl_MAX_COMBINED_TEXTURE_IMAGE_UNITS+   GetMaxDrawBuffers -> Just gl_MAX_DRAW_BUFFERS+   GetMaxFragmentUniformComponents -> Just gl_MAX_FRAGMENT_UNIFORM_COMPONENTS+   GetMaxTextureCoords -> Just gl_MAX_TEXTURE_COORDS+   GetMaxTextureImageUnits -> Just gl_MAX_TEXTURE_IMAGE_UNITS+   GetMaxVaryingFloats -> Just gl_MAX_VARYING_COMPONENTS+   GetMaxVertexAttribs -> Just gl_MAX_VERTEX_ATTRIBS+   GetMaxVertexTextureImageUnits -> Just gl_MAX_VERTEX_TEXTURE_IMAGE_UNITS+   GetMaxVertexUniformComponents -> Just gl_MAX_VERTEX_UNIFORM_COMPONENTS+   GetCurrentProgram -> Just gl_CURRENT_PROGRAM+   GetPixelPackBufferBinding -> Just gl_PIXEL_PACK_BUFFER_BINDING+   GetPixelUnpackBufferBinding -> Just gl_PIXEL_UNPACK_BUFFER_BINDING    GetDrawBufferN i -> drawBufferIndexToEnum i-   GetRGBASignedComponents -> Just 0x8C3C-   GetCopyReadBuffer -> Just 0x8F36-   GetCopyWriteBuffer -> Just 0x8F37-   -- GetWeightArrayBufferBinding -> Just 0x889e+   GetRGBASignedComponents -> Just gl_RGBA_SIGNED_COMPONENTS+   GetCopyReadBuffer -> Just gl_COPY_READ_BUFFER+   GetCopyWriteBuffer -> Just gl_COPY_WRITE_BUFFER+   -- GetWeightArrayBufferBinding -> Just gl_WEIGHT_ARRAY_BUFFER_BINDING  -------------------------------------------------------------------------------- @@ -822,34 +917,40 @@  clipPlaneIndexToEnum :: GLsizei -> Maybe GLenum clipPlaneIndexToEnum i-   | 0 <= i && i <= 0xFFF = Just (0x3000 + fromIntegral i)+   | 0 <= i && i <= maxClipPlaneIndex = Just (gl_CLIP_DISTANCE0 + fromIntegral i)    | otherwise = Nothing +maxClipPlaneIndex :: GLsizei+maxClipPlaneIndex = 0xFFF+ --------------------------------------------------------------------------------  -- 0x4000 through 0x4FFF are reserved for light numbers  lightIndexToEnum :: GLsizei -> Maybe GLenum lightIndexToEnum i-   | 0 <= i && i <= 0xFFF = Just (0x4000 + fromIntegral i)+   | 0 <= i && i <= maxLightIndex = Just (gl_LIGHT0 + fromIntegral i)    | otherwise = Nothing +maxLightIndex :: GLsizei+maxLightIndex = 0xFFF+ --------------------------------------------------------------------------------  -- 0x1700, 0x850a, and 0x8722 through 0x873f are reserved for modelview matrices  modelviewIndexToEnum :: GLsizei -> Maybe GLenum-modelviewIndexToEnum 0 = Just 0x1700-modelviewIndexToEnum 1 = Just 0x850a+modelviewIndexToEnum 0 = Just gl_MODELVIEW+modelviewIndexToEnum 1 = Just gl_MODELVIEW1 modelviewIndexToEnum i-   | 2 <= i && i <= 31 = Just (0x8720 + fromIntegral i)+   | 2 <= i && i <= 31 = Just (gl_MODELVIEW2 - 2 + fromIntegral i)    | otherwise = Nothing  modelviewEnumToIndex :: GLenum -> Maybe GLsizei modelviewEnumToIndex x-   | x == 0x1700 = Just 0-   | x == 0x850a = Just 1-   | 0x8722 <= x && x <= 0x873f = Just (fromIntegral x - 0x8720)+   | x == gl_MODELVIEW = Just 0+   | x == gl_MODELVIEW1 = Just 1+   | gl_MODELVIEW2 <= x && x <= gl_MODELVIEW31 = Just (fromIntegral (x - (gl_MODELVIEW2 - 2)))    | otherwise = Nothing  --------------------------------------------------------------------------------@@ -858,9 +959,12 @@  drawBufferIndexToEnum :: GLsizei -> Maybe GLenum drawBufferIndexToEnum i-   | 0 <= i && i <= 15 = Just (0x8825 + fromIntegral i)+   | 0 <= i && i <= maxDrawBufferIndex = Just (gl_DRAW_BUFFER0 + fromIntegral i)    | otherwise = Nothing +maxDrawBufferIndex :: GLsizei+maxDrawBufferIndex = fromIntegral (gl_DRAW_BUFFER15 - gl_DRAW_BUFFER0)+ --------------------------------------------------------------------------------  getBoolean1 :: (GLboolean -> a) -> GetPName -> IO a@@ -874,9 +978,6 @@    getBooleanv n buf    peek4 f buf -foreign import CALLCONV unsafe "glGetBooleanv" glGetBooleanv ::-   GLenum -> Ptr GLboolean -> IO ()- getBooleanv :: GetPName -> Ptr GLboolean -> IO () getBooleanv = makeGetter glGetBooleanv @@ -904,9 +1005,6 @@ getIntegerv :: GetPName -> Ptr GLint -> IO () getIntegerv = maybe (const recordInvalidEnum) glGetIntegerv . marshalGetPName -foreign import CALLCONV unsafe "glGetIntegerv" glGetIntegerv ::-   GLenum -> Ptr GLint -> IO ()- --------------------------------------------------------------------------------  getEnum1 :: (GLenum -> a) -> GetPName -> IO a@@ -941,9 +1039,6 @@ getFloatv :: GetPName -> Ptr GLfloat -> IO () getFloatv = maybe (const recordInvalidEnum) glGetFloatv . marshalGetPName -foreign import CALLCONV unsafe "glGetFloatv" glGetFloatv ::-   GLenum -> Ptr GLfloat -> IO ()- --------------------------------------------------------------------------------  getDouble1 :: (GLdouble -> a) -> GetPName -> IO a@@ -965,9 +1060,6 @@ getDoublev :: GetPName -> Ptr GLdouble -> IO () getDoublev = maybe (const recordInvalidEnum) glGetDoublev . marshalGetPName -foreign import CALLCONV unsafe "glGetDoublev" glGetDoublev ::-   GLenum -> Ptr GLdouble -> IO ()- --------------------------------------------------------------------------------  maybeNullPtr :: b -> (Ptr a -> b) -> Ptr a -> b@@ -992,20 +1084,20 @@  marshalGetVertexAttribPName :: GetVertexAttribPName -> GLenum marshalGetVertexAttribPName x = case x of-   GetVertexAttribArrayEnabled -> 0x8622-   GetVertexAttribArraySize -> 0x8623-   GetVertexAttribArrayStride -> 0x8624-   GetVertexAttribArrayType -> 0x8625-   GetVertexAttribArrayNormalized -> 0x886A-   GetCurrentVertexAttrib -> 0x8626-   GetVertexAttribArrayBufferBinding -> 0x889F-   GetVertexAttribArrayInteger -> 0x88FD+   GetVertexAttribArrayEnabled -> gl_VERTEX_ATTRIB_ARRAY_ENABLED+   GetVertexAttribArraySize -> gl_VERTEX_ATTRIB_ARRAY_SIZE+   GetVertexAttribArrayStride -> gl_VERTEX_ATTRIB_ARRAY_STRIDE+   GetVertexAttribArrayType -> gl_VERTEX_ATTRIB_ARRAY_TYPE+   GetVertexAttribArrayNormalized -> gl_VERTEX_ATTRIB_ARRAY_NORMALIZED+   GetCurrentVertexAttrib -> gl_CURRENT_VERTEX_ATTRIB+   GetVertexAttribArrayBufferBinding -> gl_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING+   GetVertexAttribArrayInteger -> gl_VERTEX_ATTRIB_ARRAY_INTEGER  --------------------------------------------------------------------------------  getVertexAttribInteger1 :: (GLint -> b) -> AttribLocation -> GetVertexAttribPName -> IO b-getVertexAttribInteger1 f location n = alloca $ \buf -> do-   glGetVertexAttribivARB location (marshalGetVertexAttribPName n) buf+getVertexAttribInteger1 f (AttribLocation location) n = alloca $ \buf -> do+   glGetVertexAttribiv location (marshalGetVertexAttribPName n) buf    peek1 f buf  getVertexAttribEnum1 :: (GLenum -> b) -> AttribLocation -> GetVertexAttribPName -> IO b@@ -1014,29 +1106,21 @@ getVertexAttribBoolean1 :: (GLboolean -> b) -> AttribLocation -> GetVertexAttribPName -> IO b getVertexAttribBoolean1 f = getVertexAttribInteger1 (f . fromIntegral) -EXTENSION_ENTRY("GL_ARB_vertex_shader or OpenGL 2.0",glGetVertexAttribivARB,AttribLocation -> GLenum -> Ptr GLint -> IO ())- getVertexAttribFloat4 :: (GLfloat -> GLfloat -> GLfloat -> GLfloat -> b) -> AttribLocation -> GetVertexAttribPName -> IO b-getVertexAttribFloat4 f location n = alloca $ \buf -> do-   glGetVertexAttribfvARB location (marshalGetVertexAttribPName n) buf+getVertexAttribFloat4 f (AttribLocation location) n = alloca $ \buf -> do+   glGetVertexAttribfv location (marshalGetVertexAttribPName n) buf    peek4 f buf -EXTENSION_ENTRY("GL_ARB_vertex_shader or OpenGL 2.0",glGetVertexAttribfvARB,AttribLocation -> GLenum -> Ptr GLfloat -> IO ())- getVertexAttribIInteger4 :: (GLint -> GLint -> GLint -> GLint -> b) -> AttribLocation -> GetVertexAttribPName -> IO b-getVertexAttribIInteger4 f location n = alloca $ \buf -> do-   glGetVertexAttribIivARB location (marshalGetVertexAttribPName n) buf+getVertexAttribIInteger4 f (AttribLocation location) n = alloca $ \buf -> do+   glGetVertexAttribIiv location (marshalGetVertexAttribPName n) buf    peek4 f buf -EXTENSION_ENTRY("GL_EXT_gpu_shader4 or OpenGL 3.0",glGetVertexAttribIivARB,AttribLocation -> GLenum -> Ptr GLint -> IO ())- getVertexAttribIuInteger4 :: (GLuint -> GLuint -> GLuint -> GLuint -> b) -> AttribLocation -> GetVertexAttribPName -> IO b-getVertexAttribIuInteger4 f location n = alloca $ \buf -> do-   glGetVertexAttribIuivARB location (marshalGetVertexAttribPName n) buf+getVertexAttribIuInteger4 f (AttribLocation location) n = alloca $ \buf -> do+   glGetVertexAttribIuiv location (marshalGetVertexAttribPName n) buf    peek4 f buf -EXTENSION_ENTRY("GL_EXT_gpu_shader4 or OpenGL 3.0",glGetVertexAttribIuivARB,AttribLocation -> GLenum -> Ptr GLuint -> IO ())- --------------------------------------------------------------------------------  data GetVertexAttribPointerPName =@@ -1044,13 +1128,11 @@  marshalGetVertexAttribPointerPName :: GetVertexAttribPointerPName -> GLenum marshalGetVertexAttribPointerPName x = case x of-   VertexAttribArrayPointer -> 0x8645+   VertexAttribArrayPointer -> gl_VERTEX_ATTRIB_ARRAY_POINTER  --------------------------------------------------------------------------------  getVertexAttribPointer :: AttribLocation -> GetVertexAttribPointerPName -> IO (Ptr a)-getVertexAttribPointer location n = alloca $ \buf -> do-   glGetVertexAttribPointervARB location (marshalGetVertexAttribPointerPName n) buf+getVertexAttribPointer (AttribLocation location) n = alloca $ \buf -> do+   glGetVertexAttribPointerv location (marshalGetVertexAttribPointerPName n) buf    peek buf--EXTENSION_ENTRY("GL_ARB_vertex_shader or OpenGL 2.0",glGetVertexAttribPointervARB,AttribLocation -> GLenum -> Ptr (Ptr a) -> IO ())

@@ -21,31 +21,24 @@    rasterPositionUnclipped ) where -import Data.Int-import Foreign.Ptr ( Ptr, castPtr )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLshort, GLint, GLfloat, GLdouble, Capability )-import Graphics.Rendering.OpenGL.GL.GLboolean ( unmarshalGLboolean )-import Graphics.Rendering.OpenGL.GL.Capability (-   EnableCap(CapRasterPositionUnclipped), makeCapability )-import Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO, Invoker, getProcAddress )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetCurrentRasterPosition,GetCurrentRasterDistance,-            GetCurrentRasterColor,GetCurrentRasterSecondaryColor,-            GetCurrentRasterIndex,GetCurrentRasterTextureCoords,-            GetCurrentRasterPositionValid),-   getBoolean1, getInteger1, getFloat1, getFloat4 )-import Graphics.Rendering.OpenGL.GL.StateVar (-   GettableStateVar, makeGettableStateVar, StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GL.VertexSpec (-   Vertex2(..), Vertex3(..), Vertex4(..), TexCoord4(..),-   Color4(..), Index1(..) )------------------------------------------------------------------------------------#include "HsOpenGLExt.h"-#include "HsOpenGLTypes.h"+import Data.StateVar+import Data.Tensor+import Foreign.C.Types+import Foreign.Ptr+import Graphics.Rendering.OpenGL.GL.Capability+import Graphics.Rendering.OpenGL.GL.GLboolean+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glRasterPos2d, glRasterPos2dv, glRasterPos2f, glRasterPos2fv, glRasterPos2i,+   glRasterPos2iv, glRasterPos2s, glRasterPos2sv, glRasterPos3d, glRasterPos3dv,+   glRasterPos3f, glRasterPos3fv, glRasterPos3i, glRasterPos3iv, glRasterPos3s,+   glRasterPos3sv, glRasterPos4d, glRasterPos4dv, glRasterPos4f, glRasterPos4fv,+   glRasterPos4i, glRasterPos4iv, glRasterPos4s, glRasterPos4sv, glWindowPos2d,+   glWindowPos2dv, glWindowPos2f, glWindowPos2fv, glWindowPos2i, glWindowPos2iv,+   glWindowPos2s, glWindowPos2sv, glWindowPos3d, glWindowPos3dv, glWindowPos3f,+   glWindowPos3fv, glWindowPos3i, glWindowPos3iv, glWindowPos3s, glWindowPos3sv )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -64,27 +57,8 @@    rasterPos3v :: Ptr a -> IO ()    rasterPos4v :: Ptr a -> IO () -----------------------------------------------------------------------------------foreign import CALLCONV unsafe "glRasterPos2s" glRasterPos2s ::-   GLshort -> GLshort -> IO ()--foreign import CALLCONV unsafe "glRasterPos3s" glRasterPos3s ::-   GLshort -> GLshort -> GLshort -> IO ()--foreign import CALLCONV unsafe "glRasterPos4s" glRasterPos4s ::-   GLshort -> GLshort -> GLshort -> GLshort -> IO ()--foreign import CALLCONV unsafe "glRasterPos2sv" glRasterPos2sv ::-   Ptr GLshort -> IO ()--foreign import CALLCONV unsafe "glRasterPos3sv" glRasterPos3sv ::-   Ptr GLshort -> IO ()--foreign import CALLCONV unsafe "glRasterPos4sv" glRasterPos4sv ::-   Ptr GLshort -> IO ()--instance RasterPosComponent GLshort_ where+-- GLshort instance+instance RasterPosComponent CShort where    rasterPos2 = glRasterPos2s    rasterPos3 = glRasterPos3s    rasterPos4 = glRasterPos4s@@ -93,27 +67,8 @@    rasterPos3v = glRasterPos3sv    rasterPos4v = glRasterPos4sv -----------------------------------------------------------------------------------foreign import CALLCONV unsafe "glRasterPos2i" glRasterPos2i ::-   GLint -> GLint -> IO ()--foreign import CALLCONV unsafe "glRasterPos3i" glRasterPos3i ::-   GLint -> GLint -> GLint -> IO ()--foreign import CALLCONV unsafe "glRasterPos4i" glRasterPos4i ::-   GLint -> GLint -> GLint -> GLint -> IO ()--foreign import CALLCONV unsafe "glRasterPos2iv" glRasterPos2iv ::-   Ptr GLint -> IO ()--foreign import CALLCONV unsafe "glRasterPos3iv" glRasterPos3iv ::-   Ptr GLint -> IO ()--foreign import CALLCONV unsafe "glRasterPos4iv" glRasterPos4iv ::-   Ptr GLint -> IO ()--instance RasterPosComponent GLint_ where+-- GLint instance+instance RasterPosComponent CInt where    rasterPos2 = glRasterPos2i    rasterPos3 = glRasterPos3i    rasterPos4 = glRasterPos4i@@ -122,27 +77,8 @@    rasterPos3v = glRasterPos3iv    rasterPos4v = glRasterPos4iv -----------------------------------------------------------------------------------foreign import CALLCONV unsafe "glRasterPos2f" glRasterPos2f ::-   GLfloat -> GLfloat -> IO ()--foreign import CALLCONV unsafe "glRasterPos3f" glRasterPos3f ::-   GLfloat -> GLfloat -> GLfloat -> IO ()--foreign import CALLCONV unsafe "glRasterPos4f" glRasterPos4f ::-   GLfloat -> GLfloat -> GLfloat -> GLfloat -> IO ()--foreign import CALLCONV unsafe "glRasterPos2fv" glRasterPos2fv ::-   Ptr GLfloat -> IO ()--foreign import CALLCONV unsafe "glRasterPos3fv" glRasterPos3fv ::-   Ptr GLfloat -> IO ()--foreign import CALLCONV unsafe "glRasterPos4fv" glRasterPos4fv ::-   Ptr GLfloat -> IO ()--instance RasterPosComponent GLfloat_ where+-- GLfloat instance+instance RasterPosComponent CFloat where    rasterPos2 = glRasterPos2f    rasterPos3 = glRasterPos3f    rasterPos4 = glRasterPos4f@@ -151,27 +87,8 @@    rasterPos3v = glRasterPos3fv    rasterPos4v = glRasterPos4fv -----------------------------------------------------------------------------------foreign import CALLCONV unsafe "glRasterPos2d" glRasterPos2d ::-   GLdouble -> GLdouble -> IO ()--foreign import CALLCONV unsafe "glRasterPos3d" glRasterPos3d ::-   GLdouble -> GLdouble -> GLdouble -> IO ()--foreign import CALLCONV unsafe "glRasterPos4d" glRasterPos4d ::-   GLdouble -> GLdouble -> GLdouble -> GLdouble -> IO ()--foreign import CALLCONV unsafe "glRasterPos2dv" glRasterPos2dv ::-   Ptr GLdouble -> IO ()--foreign import CALLCONV unsafe "glRasterPos3dv" glRasterPos3dv ::-   Ptr GLdouble -> IO ()--foreign import CALLCONV unsafe "glRasterPos4dv" glRasterPos4dv ::-   Ptr GLdouble -> IO ()--instance RasterPosComponent GLdouble_ where+-- GLdouble instance+instance RasterPosComponent CDouble where    rasterPos2 = glRasterPos2d    rasterPos3 = glRasterPos3d    rasterPos4 = glRasterPos4d@@ -207,61 +124,37 @@    windowPos2v :: Ptr a -> IO ()    windowPos3v :: Ptr a -> IO () -----------------------------------------------------------------------------------EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos2sARB,GLshort -> GLshort -> IO ())-EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos3sARB,GLshort -> GLshort -> GLshort -> IO ())-EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos2svARB,Ptr GLshort -> IO ())-EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos3svARB,Ptr GLshort -> IO ())--instance WindowPosComponent GLshort_ where-   windowPos2 = glWindowPos2sARB-   windowPos3 = glWindowPos3sARB--   windowPos2v = glWindowPos2svARB-   windowPos3v = glWindowPos3svARB------------------------------------------------------------------------------------EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos2iARB,GLint -> GLint -> IO ())-EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos3iARB,GLint -> GLint -> GLint -> IO ())-EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos2ivARB,Ptr GLint -> IO ())-EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos3ivARB,Ptr GLint -> IO ())--instance WindowPosComponent GLint_ where-   windowPos2 = glWindowPos2iARB-   windowPos3 = glWindowPos3iARB--   windowPos2v = glWindowPos2ivARB-   windowPos3v = glWindowPos3ivARB----------------------------------------------------------------------------------+-- GLshort instance+instance WindowPosComponent CShort where+   windowPos2 = glWindowPos2s+   windowPos3 = glWindowPos3s -EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos2fARB,GLfloat -> GLfloat -> IO ())-EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos3fARB,GLfloat -> GLfloat -> GLfloat -> IO ())-EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos2fvARB,Ptr GLfloat -> IO ())-EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos3fvARB,Ptr GLfloat -> IO ())+   windowPos2v = glWindowPos2sv+   windowPos3v = glWindowPos3sv -instance WindowPosComponent GLfloat_ where-   windowPos2 = glWindowPos2fARB-   windowPos3 = glWindowPos3fARB+-- GLint instance+instance WindowPosComponent CInt where+   windowPos2 = glWindowPos2i+   windowPos3 = glWindowPos3i -   windowPos2v = glWindowPos2fvARB-   windowPos3v = glWindowPos3fvARB+   windowPos2v = glWindowPos2iv+   windowPos3v = glWindowPos3iv ---------------------------------------------------------------------------------+-- GLfloat instance+instance WindowPosComponent CFloat where+   windowPos2 = glWindowPos2f+   windowPos3 = glWindowPos3f -EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos2dARB,GLdouble -> GLdouble -> IO ())-EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos3dARB,GLdouble -> GLdouble -> GLdouble -> IO ())-EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos2dvARB,Ptr GLdouble -> IO ())-EXTENSION_ENTRY("GL_ARB_window_pos or OpenGL 1.4",glWindowPos3dvARB,Ptr GLdouble -> IO ())+   windowPos2v = glWindowPos2fv+   windowPos3v = glWindowPos3fv -instance WindowPosComponent GLdouble_ where-   windowPos2 = glWindowPos2dARB-   windowPos3 = glWindowPos3dARB+-- GLdouble instance+instance WindowPosComponent CDouble where+   windowPos2 = glWindowPos2d+   windowPos3 = glWindowPos3d -   windowPos2v = glWindowPos2dvARB-   windowPos3v = glWindowPos3dvARB+   windowPos2v = glWindowPos2dv+   windowPos3v = glWindowPos3dv  -------------------------------------------------------------------------------- 

@@ -21,18 +21,16 @@    PixelCopyType(..), copyPixels ) where -import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum, GLint, GLsizei )-import Graphics.Rendering.OpenGL.GL.BufferMode (-   marshalBufferMode, unmarshalBufferMode )-import Graphics.Rendering.OpenGL.GL.Framebuffer ( BufferMode(..) )-import Graphics.Rendering.OpenGL.GL.CoordTrans ( Position(..), Size(..) )-import Graphics.Rendering.OpenGL.GL.PixelData ( withPixelData )-import Graphics.Rendering.OpenGL.GL.PixelRectangles ( PixelData )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetReadBuffer), getEnum1 )-import Graphics.Rendering.OpenGL.GL.StateVar ( StateVar, makeStateVar )-import Graphics.Rendering.OpenGL.GLU.ErrorsInternal ( recordInvalidValue )+import Data.StateVar+import Graphics.Rendering.OpenGL.GL.BufferMode+import Graphics.Rendering.OpenGL.GL.CoordTrans+import Graphics.Rendering.OpenGL.GL.Framebuffer+import Graphics.Rendering.OpenGL.GL.PixelData+import Graphics.Rendering.OpenGL.GL.PixelRectangles+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GLU.ErrorsInternal+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility ( glCopyPixels )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -40,9 +38,6 @@ readPixels (Position x y) (Size w h) pd =    withPixelData pd $ glReadPixels x y w h -foreign import CALLCONV unsafe "glReadPixels" glReadPixels ::-   GLint -> GLint -> GLsizei -> GLsizei -> GLenum -> GLenum -> Ptr a -> IO ()- --------------------------------------------------------------------------------  readBuffer :: StateVar BufferMode@@ -51,8 +46,6 @@       (getEnum1 unmarshalBufferMode GetReadBuffer)       (maybe recordInvalidValue glReadBuffer . marshalBufferMode) -foreign import CALLCONV unsafe "glReadBuffer" glReadBuffer :: GLenum -> IO ()- --------------------------------------------------------------------------------  data PixelCopyType =@@ -63,15 +56,12 @@  marshalPixelCopyType :: PixelCopyType -> GLenum marshalPixelCopyType x = case x of-   CopyColor -> 0x1800-   CopyDepth -> 0x1801-   CopyStencil -> 0x1802+   CopyColor -> gl_COLOR+   CopyDepth -> gl_DEPTH+   CopyStencil -> gl_STENCIL  --------------------------------------------------------------------------------  copyPixels :: Position -> Size -> PixelCopyType -> IO () copyPixels (Position x y) (Size w h) t =    glCopyPixels x y w h (marshalPixelCopyType t)--foreign import CALLCONV unsafe "glCopyPixels" glCopyPixels ::-   GLint -> GLint -> GLsizei -> GLsizei -> GLenum -> IO ()

@@ -16,19 +16,11 @@    Rect(..) ) where -import Data.Int-import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLshort, GLint, GLfloat, GLdouble )-import Graphics.Rendering.OpenGL.GL.VertexSpec ( Vertex2(..) )-#ifdef __HADDOCK__-import Graphics.Rendering.OpenGL.GL.BeginEnd ( PrimitiveMode(Polygon) )-#endif------------------------------------------------------------------------------------#include "HsOpenGLExt.h"-#include "HsOpenGLTypes.h"+import Data.Tensor+import Foreign.C.Types+import Foreign.Ptr+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glRectd, glRectdv, glRectf, glRectfv, glRecti, glRectiv, glRects, glRectsv )  -------------------------------------------------------------------------------- @@ -56,50 +48,22 @@    rect  :: Vertex2 a -> Vertex2 a -> IO ()    rectv :: Ptr     a -> Ptr     a -> IO () -----------------------------------------------------------------------------------foreign import CALLCONV unsafe "glRects" glRects ::-   GLshort -> GLshort -> GLshort -> GLshort -> IO ()--foreign import CALLCONV unsafe "glRectsv" glRectsv ::-   Ptr GLshort -> Ptr GLshort -> IO ()--instance Rect GLshort_ where+-- GLshort instance+instance Rect CShort where    rect (Vertex2 x1 y1) (Vertex2 x2 y2) = glRects x1 y1 x2 y2    rectv ptr1 ptr2 = glRectsv ptr1 ptr2 -----------------------------------------------------------------------------------foreign import CALLCONV unsafe "glRecti" glRecti ::-   GLint -> GLint -> GLint -> GLint -> IO ()--foreign import CALLCONV unsafe "glRectiv" glRectiv ::-   Ptr GLint -> Ptr GLint -> IO ()--instance Rect GLint_ where+-- GLint instance+instance Rect CInt where    rect (Vertex2 x1 y1) (Vertex2 x2 y2) = glRecti x1 y1 x2 y2    rectv ptr1 ptr2 = glRectiv ptr1 ptr2 -----------------------------------------------------------------------------------foreign import CALLCONV unsafe "glRectf" glRectf ::-   GLfloat -> GLfloat -> GLfloat -> GLfloat -> IO ()--foreign import CALLCONV unsafe "glRectfv" glRectfv ::-   Ptr GLfloat -> Ptr GLfloat -> IO ()--instance Rect GLfloat_ where+-- GLfloat instance+instance Rect CFloat where    rect (Vertex2 x1 y1) (Vertex2 x2 y2) = glRectf x1 y1 x2 y2    rectv ptr1 ptr2 = glRectfv ptr1 ptr2 -----------------------------------------------------------------------------------foreign import CALLCONV unsafe "glRectd" glRectd ::-   GLdouble -> GLdouble -> GLdouble -> GLdouble -> IO ()--foreign import CALLCONV unsafe "glRectdv" glRectdv ::-   Ptr GLdouble -> Ptr GLdouble -> IO ()--instance Rect GLdouble_ where+-- GLdouble instance+instance Rect CDouble where    rect (Vertex2 x1 y1) (Vertex2 x2 y2) = glRectd x1 y1 x2 y2    rectv ptr1 ptr2 = glRectdv ptr1 ptr2

@@ -17,12 +17,12 @@    RenderMode(..), withRenderMode, renderMode ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLenum, GLint )-import Graphics.Rendering.OpenGL.GL.Exception ( finallyRet )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetRenderMode), getEnum1 )-import Graphics.Rendering.OpenGL.GL.StateVar (-   HasGetter(get), GettableStateVar, makeGettableStateVar )+import Data.StateVar+import Graphics.Rendering.OpenGL.GL.Exception+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glRenderMode, gl_FEEDBACK, gl_RENDER, gl_SELECT )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -34,15 +34,15 @@  marshalRenderMode :: RenderMode -> GLenum marshalRenderMode x = case x of-   Render -> 0x1c00-   Feedback -> 0x1c01-   Select -> 0x1c02+   Render -> gl_RENDER+   Feedback -> gl_FEEDBACK+   Select -> gl_SELECT  unmarshalRenderMode :: GLenum -> RenderMode unmarshalRenderMode x-   | x == 0x1c00 = Render-   | x == 0x1c01 = Feedback-   | x == 0x1c02 = Select+   | x == gl_RENDER = Render+   | x == gl_FEEDBACK = Feedback+   | x == gl_SELECT = Select    | otherwise = error ("unmarshalRenderMode: illegal value " ++ show x)  --------------------------------------------------------------------------------@@ -55,8 +55,6 @@  setRenderMode :: RenderMode -> IO GLint setRenderMode = glRenderMode . marshalRenderMode--foreign import CALLCONV unsafe "glRenderMode" glRenderMode :: GLenum -> IO GLint  -------------------------------------------------------------------------------- 

@@ -18,8 +18,17 @@    ClientAttributeGroup(..), preservingClientAttrib ) where -import Graphics.Rendering.OpenGL.GL.BasicTypes ( GLbitfield ) import Graphics.Rendering.OpenGL.GL.Exception ( bracket_ )+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glPopAttrib, glPopClientAttrib, glPushAttrib, glPushClientAttrib,+   gl_ACCUM_BUFFER_BIT, gl_ALL_ATTRIB_BITS, gl_CLIENT_ALL_ATTRIB_BITS,+   gl_CLIENT_PIXEL_STORE_BIT, gl_CLIENT_VERTEX_ARRAY_BIT,+   gl_CURRENT_BIT, gl_ENABLE_BIT, gl_EVAL_BIT, gl_FOG_BIT,+   gl_HINT_BIT, gl_LIGHTING_BIT, gl_LINE_BIT, gl_LIST_BIT,+   gl_MULTISAMPLE_BIT, gl_PIXEL_MODE_BIT, gl_POINT_BIT,+   gl_POLYGON_BIT, gl_POLYGON_STIPPLE_BIT, gl_SCISSOR_BIT,+   gl_TEXTURE_BIT, gl_TRANSFORM_BIT, gl_VIEWPORT_BIT )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -50,28 +59,28 @@  marshalServerAttributeGroup :: ServerAttributeGroup -> GLbitfield marshalServerAttributeGroup x = case x of-   CurrentAttributes -> 0x1-   PointAttributes -> 0x2-   LineAttributes -> 0x4-   PolygonAttributes -> 0x8-   PolygonStippleAttributes -> 0x10-   PixelModeAttributes -> 0x20-   LightingAttributes -> 0x40-   FogAttributes -> 0x80-   DepthBufferAttributes -> 0x100-   AccumBufferAttributes -> 0x200-   StencilBufferAttributes -> 0x400-   ViewportAttributes -> 0x800-   TransformAttributes -> 0x1000-   EnableAttributes -> 0x2000-   ColorBufferAttributes -> 0x4000-   HintAttributes -> 0x8000-   EvalAttributes -> 0x10000-   ListAttributes -> 0x20000-   TextureAttributes -> 0x40000-   ScissorAttributes -> 0x80000-   MultisampleAttributes -> 0x20000000-   AllServerAttributes -> 0xffffffff+   CurrentAttributes -> gl_CURRENT_BIT+   PointAttributes -> gl_POINT_BIT+   LineAttributes -> gl_LINE_BIT+   PolygonAttributes -> gl_POLYGON_BIT+   PolygonStippleAttributes -> gl_POLYGON_STIPPLE_BIT+   PixelModeAttributes -> gl_PIXEL_MODE_BIT+   LightingAttributes -> gl_LIGHTING_BIT+   FogAttributes -> gl_FOG_BIT+   DepthBufferAttributes -> gl_DEPTH_BUFFER_BIT+   AccumBufferAttributes -> gl_ACCUM_BUFFER_BIT+   StencilBufferAttributes -> gl_STENCIL_BUFFER_BIT+   ViewportAttributes -> gl_VIEWPORT_BIT+   TransformAttributes -> gl_TRANSFORM_BIT+   EnableAttributes -> gl_ENABLE_BIT+   ColorBufferAttributes -> gl_COLOR_BUFFER_BIT+   HintAttributes -> gl_HINT_BIT+   EvalAttributes -> gl_EVAL_BIT+   ListAttributes -> gl_LIST_BIT+   TextureAttributes -> gl_TEXTURE_BIT+   ScissorAttributes -> gl_SCISSOR_BIT+   MultisampleAttributes -> gl_MULTISAMPLE_BIT+   AllServerAttributes -> gl_ALL_ATTRIB_BITS  -------------------------------------------------------------------------------- @@ -81,12 +90,6 @@ pushAttrib :: [ServerAttributeGroup] -> IO () pushAttrib = glPushAttrib . sum . map marshalServerAttributeGroup -foreign import CALLCONV unsafe "glPushAttrib"-   glPushAttrib :: GLbitfield -> IO ()--foreign import CALLCONV unsafe "glPopAttrib"-   glPopAttrib :: IO ()- --------------------------------------------------------------------------------  data ClientAttributeGroup =@@ -97,9 +100,9 @@  marshalClientAttributeGroup :: ClientAttributeGroup -> GLbitfield marshalClientAttributeGroup x = case x of-   PixelStoreAttributes -> 0x1-   VertexArrayAttributes -> 0x2-   AllClientAttributes -> 0xffffffff+   PixelStoreAttributes -> gl_CLIENT_PIXEL_STORE_BIT+   VertexArrayAttributes -> gl_CLIENT_VERTEX_ARRAY_BIT+   AllClientAttributes -> gl_CLIENT_ALL_ATTRIB_BITS  -------------------------------------------------------------------------------- @@ -109,9 +112,3 @@  pushClientAttrib :: [ClientAttributeGroup] -> IO () pushClientAttrib = glPushClientAttrib . sum . map marshalClientAttributeGroup--foreign import CALLCONV unsafe "glPushClientAttrib"-   glPushClientAttrib :: GLbitfield -> IO ()--foreign import CALLCONV unsafe "glPopClientAttrib"-   glPopClientAttrib :: IO ()

@@ -18,19 +18,16 @@    RenderMode(..), renderMode ) where -import Foreign.Marshal.Array ( allocaArray )-import Foreign.Ptr ( Ptr )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLint, GLsizei, GLuint, GLfloat )-import Graphics.Rendering.OpenGL.GL.Exception ( bracket_ )-import Graphics.Rendering.OpenGL.GL.IOState (-   IOState, peekIOState, evalIOState, nTimes )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetMaxNameStackDepth,GetNameStackDepth), getSizei1 )-import Graphics.Rendering.OpenGL.GL.RenderMode (-   RenderMode(..), withRenderMode, renderMode )-import Graphics.Rendering.OpenGL.GL.StateVar (-   GettableStateVar, makeGettableStateVar )+import Data.StateVar+import Foreign.Marshal.Array+import Foreign.Ptr+import Graphics.Rendering.OpenGL.GL.Exception+import Graphics.Rendering.OpenGL.GL.IOState+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.RenderMode+import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (+   glSelectBuffer, glInitNames, glPushName, glPopName, glLoadName )+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -49,11 +46,6 @@       hits <- parseSelectionBuffer numHits buf       return (value, hits) -foreign import CALLCONV unsafe "glInitNames" glInitNames :: IO ()--foreign import CALLCONV unsafe "glSelectBuffer" glSelectBuffer ::-   GLsizei -> Ptr GLuint -> IO ()- --------------------------------------------------------------------------------  parseSelectionBuffer :: GLint -> Ptr GLuint -> IO (Maybe [HitRecord])@@ -86,13 +78,10 @@    deriving ( Eq, Ord, Show )  withName :: Name -> IO a -> IO a-withName name = bracket_ (glPushName name) glPopName--foreign import CALLCONV unsafe "glPopName" glPopName :: IO ()--foreign import CALLCONV unsafe "glPushName" glPushName :: Name -> IO ()+withName (Name name) = bracket_ (glPushName name) glPopName -foreign import CALLCONV unsafe "glLoadName" loadName :: Name -> IO ()+loadName :: Name -> IO ()+loadName (Name n) = glLoadName n  maxNameStackDepth :: GettableStateVar GLsizei maxNameStackDepth = makeGettableStateVar (getSizei1 id GetMaxNameStackDepth)

@@ -35,42 +35,24 @@    maxFragmentUniformComponents, maxVertexAttribs, maxVaryingFloats ) where -import Control.Monad ( replicateM, mapM_, foldM )-import Control.Monad.Fix ( MonadFix(..) )-import Data.Int-import Data.List ( genericLength, (\\) )-import Data.Word-import Foreign.C.String ( peekCAStringLen, withCAStringLen, withCAString )-import Foreign.Marshal.Alloc ( alloca, allocaBytes )-import Foreign.Marshal.Array ( allocaArray, withArray, peekArray )-import Foreign.Marshal.Utils ( withMany )-import Foreign.Ptr ( Ptr, castPtr, nullPtr )-import Foreign.Storable ( Storable(peek,sizeOf) )-import Graphics.Rendering.OpenGL.GL.BasicTypes (-   GLboolean, GLchar, GLint, GLuint, GLsizei, GLenum, GLfloat )-import Graphics.Rendering.OpenGL.GL.BufferObjects ( ObjectName(..) )-import Graphics.Rendering.OpenGL.GL.Extensions (-   FunPtr, unsafePerformIO, Invoker, getProcAddress )-import Graphics.Rendering.OpenGL.GL.GLboolean ( unmarshalGLboolean )-import Graphics.Rendering.OpenGL.GL.PeekPoke ( peek1 )-import Graphics.Rendering.OpenGL.GL.QueryUtils (-   GetPName(GetMaxCombinedTextureImageUnits, GetMaxFragmentUniformComponents,-            GetMaxTextureCoords, GetMaxTextureImageUnits,GetMaxVaryingFloats,-            GetMaxVertexAttribs, GetMaxVertexTextureImageUnits,-            GetMaxVertexUniformComponents, GetCurrentProgram),-   getInteger1, getSizei1 )-import Graphics.Rendering.OpenGL.GL.StateVar (-   HasGetter(get), GettableStateVar, makeGettableStateVar, StateVar,-   makeStateVar )-import Graphics.Rendering.OpenGL.GL.VertexSpec (-   AttribLocation(..), Vertex2(..), Vertex3(..), Vertex4(..), TexCoord1(..),-   TexCoord2(..), TexCoord3(..), TexCoord4(..), Normal3(..), FogCoord1(..),-   Color3(..), Color4(..), Index1(..) )------------------------------------------------------------------------------------#include "HsOpenGLExt.h"-#include "HsOpenGLTypes.h"+import Control.Monad+import Control.Monad.Fix+import Data.List+import Data.ObjectName+import Data.StateVar+import Data.Tensor+import Foreign.C.String+import Foreign.C.Types+import Foreign.Marshal.Alloc+import Foreign.Marshal.Array+import Foreign.Marshal.Utils+import Foreign.Ptr+import Foreign.Storable+import Graphics.Rendering.OpenGL.GL.GLboolean+import Graphics.Rendering.OpenGL.GL.PeekPoke+import Graphics.Rendering.OpenGL.GL.QueryUtils+import Graphics.Rendering.OpenGL.GL.VertexSpec+import Graphics.Rendering.OpenGL.Raw.Core31  -------------------------------------------------------------------------------- @@ -105,12 +87,12 @@ instance Shader VertexShader where    makeShader = VertexShader    shaderID = vertexShaderID-   shaderType = const 0x8B31+   shaderType = const gl_VERTEX_SHADER  instance Shader FragmentShader where    makeShader = FragmentShader    shaderID = fragmentShaderID-   shaderType = const 0x8B30+   shaderType = const gl_FRAGMENT_SHADER  -------------------------------------------------------------------------------- @@ -136,17 +118,11 @@ isShaderName :: Shader s => s -> IO Bool isShaderName = fmap unmarshalGLboolean . glIsShader . shaderID -EXTENSION_ENTRY("OpenGL 2.0",glCreateShader,GLenum -> IO GLuint)-EXTENSION_ENTRY("OpenGL 2.0",glDeleteShader,GLuint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glIsShader,GLuint -> IO GLboolean)- --------------------------------------------------------------------------------  compileShader :: Shader s => s -> IO () compileShader = glCompileShader . shaderID -EXTENSION_ENTRY("OpenGL 2.0",glCompileShader,GLuint -> IO ())- --------------------------------------------------------------------------------  shaderSource :: Shader s => s -> StateVar [String]@@ -162,16 +138,12 @@          withArray lengths $ \lengthsBuf ->             glShaderSource (shaderID shader) len charBufsBuf lengthsBuf -EXTENSION_ENTRY("OpenGL 2.0",glShaderSource,GLuint -> GLsizei -> Ptr (Ptr GLchar) -> Ptr GLint -> IO ())- getShaderSource :: Shader s => s -> IO [String] getShaderSource shader = do    src <- get (stringQuery (shaderSourceLength shader)                            (glGetShaderSource (shaderID shader)))    return [src] -EXTENSION_ENTRY("OpenGL 2.0",glGetShaderSource,GLuint -> GLsizei -> Ptr GLsizei -> Ptr GLchar -> IO ())- stringQuery :: GettableStateVar GLsizei -> (GLsizei -> Ptr GLsizei -> Ptr GLchar -> IO ()) -> GettableStateVar String stringQuery lengthVar getStr =    makeGettableStateVar $ do@@ -188,8 +160,6 @@ shaderInfoLog shader =    stringQuery (shaderInfoLogLength shader) (glGetShaderInfoLog (shaderID shader)) -EXTENSION_ENTRY("OpenGL 2.0",glGetShaderInfoLog,GLuint -> GLsizei -> Ptr GLsizei -> Ptr GLchar -> IO ())- --------------------------------------------------------------------------------  shaderDeleteStatus :: Shader s => s -> GettableStateVar Bool@@ -218,11 +188,11 @@  marshalGetShaderPName :: GetShaderPName -> GLenum marshalGetShaderPName x = case x of-   ShaderDeleteStatus -> 0x8B80-   CompileStatus -> 0x8B81-   ShaderInfoLogLength -> 0x8B84-   ShaderSourceLength -> 0x8B88-   ShaderType -> 0x8B4F+   ShaderDeleteStatus -> gl_DELETE_STATUS+   CompileStatus -> gl_COMPILE_STATUS+   ShaderInfoLogLength -> gl_INFO_LOG_LENGTH+   ShaderSourceLength -> gl_SHADER_SOURCE_LENGTH+   ShaderType -> gl_SHADER_TYPE  shaderVar :: Shader s => (GLint -> a) -> GetShaderPName -> s -> GettableStateVar a shaderVar f p shader =@@ -231,8 +201,6 @@          glGetShaderiv (shaderID shader) (marshalGetShaderPName p) buf          peek1 f buf -EXTENSION_ENTRY("OpenGL 2.0",glGetShaderiv,GLuint -> GLenum -> Ptr GLint -> IO ())- --------------------------------------------------------------------------------  newtype Program = Program { programID :: GLuint }@@ -243,10 +211,6 @@    deleteObjectNames = mapM_ (glDeleteProgram . programID)    isObjectName = fmap unmarshalGLboolean . glIsProgram . programID -EXTENSION_ENTRY("OpenGL 2.0",glCreateProgram,IO GLuint)-EXTENSION_ENTRY("OpenGL 2.0",glDeleteProgram,GLuint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glIsProgram,GLuint -> IO GLboolean)- --------------------------------------------------------------------------------  attachedShaders :: Program -> StateVar ([VertexShader],[FragmentShader])@@ -263,8 +227,6 @@       glGetAttachedShaders (programID program) numShaders nullPtr buf       peekArray (fromIntegral numShaders) buf -EXTENSION_ENTRY("OpenGL 2.0",glGetAttachedShaders,GLuint -> GLsizei -> Ptr GLsizei -> Ptr GLuint -> IO ())- splitShaderIDs :: [GLuint] -> IO ([VertexShader],[FragmentShader]) splitShaderIDs ids = do    (vs, fs) <- partitionM isVertexShaderID ids@@ -282,28 +244,23 @@             return $ if b then (x:ts, fs) else (ts, x:fs)  setAttachedShaders :: Program -> ([VertexShader],[FragmentShader]) -> IO ()-setAttachedShaders program (vs, fs) = do-   currentIDs <- getAttachedShaderIDs program+setAttachedShaders p@(Program program) (vs, fs) = do+   currentIDs <- getAttachedShaderIDs p    let newIDs = map shaderID vs ++ map shaderID fs    mapM_ (glAttachShader program) (newIDs \\ currentIDs)    mapM_ (glDetachShader program) (currentIDs \\ newIDs) -EXTENSION_ENTRY("OpenGL 2.0",glAttachShader,Program -> GLuint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glDetachShader,Program -> GLuint -> IO ())- --------------------------------------------------------------------------------  linkProgram :: Program -> IO ()-linkProgram = glLinkProgram--EXTENSION_ENTRY("OpenGL 2.0",glLinkProgram,Program -> IO ())+linkProgram (Program program) = glLinkProgram program  currentProgram :: StateVar (Maybe Program) currentProgram =    makeStateVar       (do p <- getCurrentProgram           return $ if p == noProgram then Nothing else Just p)-      (glUseProgram . maybe noProgram id)+      ((\(Program p) -> glUseProgram p) . maybe noProgram id)  getCurrentProgram :: IO Program getCurrentProgram = fmap Program $ getInteger1 fromIntegral GetCurrentProgram@@ -311,19 +268,13 @@ noProgram :: Program noProgram = Program 0 -EXTENSION_ENTRY("OpenGL 2.0",glUseProgram,Program -> IO ())- validateProgram :: Program -> IO ()-validateProgram = glValidateProgram--EXTENSION_ENTRY("OpenGL 2.0",glValidateProgram,Program -> IO ())+validateProgram (Program program) = glValidateProgram program  programInfoLog :: Program -> GettableStateVar String programInfoLog p =    stringQuery (programInfoLogLength p) (glGetProgramInfoLog (programID p)) -EXTENSION_ENTRY("OpenGL 2.0",glGetProgramInfoLog,GLuint -> GLsizei -> Ptr GLsizei -> Ptr GLchar -> IO ())- --------------------------------------------------------------------------------  programDeleteStatus :: Program -> GettableStateVar Bool@@ -368,15 +319,15 @@  marshalGetProgramPName :: GetProgramPName -> GLenum marshalGetProgramPName x = case x of-   ProgramDeleteStatus -> 0x8B80-   LinkStatus -> 0x8B82-   ValidateStatus -> 0x8B83-   ProgramInfoLogLength -> 0x8B84-   AttachedShaders -> 0x8B85-   ActiveAttributes -> 0x8B89-   ActiveAttributeMaxLength -> 0x8B8A-   ActiveUniforms -> 0x8B86-   ActiveUniformMaxLength -> 0x8B87+   ProgramDeleteStatus -> gl_DELETE_STATUS+   LinkStatus -> gl_LINK_STATUS+   ValidateStatus -> gl_VALIDATE_STATUS+   ProgramInfoLogLength -> gl_INFO_LOG_LENGTH+   AttachedShaders -> gl_ATTACHED_SHADERS+   ActiveAttributes -> gl_ACTIVE_ATTRIBUTES+   ActiveAttributeMaxLength -> gl_ACTIVE_ATTRIBUTE_MAX_LENGTH+   ActiveUniforms -> gl_ACTIVE_UNIFORMS+   ActiveUniformMaxLength -> gl_ACTIVE_UNIFORM_MAX_LENGTH  programVar :: (GLint -> a) -> GetProgramPName -> Program -> GettableStateVar a programVar f p program =@@ -385,8 +336,6 @@          glGetProgramiv (programID program) (marshalGetProgramPName p) buf          peek1 f buf -EXTENSION_ENTRY("OpenGL 2.0",glGetProgramiv,GLuint -> GLenum -> Ptr GLint -> IO ())- --------------------------------------------------------------------------------  attribLocation :: Program -> String -> StateVar AttribLocation@@ -395,20 +344,16 @@                 (\location -> bindAttribLocation program location name)  getAttribLocation :: Program -> String -> IO AttribLocation-getAttribLocation program name =+getAttribLocation (Program program) name =    fmap (AttribLocation . fromIntegral) $       withGLString name $          glGetAttribLocation program -EXTENSION_ENTRY("OpenGL 2.0",glGetAttribLocation,Program -> Ptr GLchar -> IO GLint)- bindAttribLocation :: Program -> AttribLocation -> String -> IO ()-bindAttribLocation program location name =+bindAttribLocation (Program program) (AttribLocation location) name =    withGLString name $       glBindAttribLocation program location -EXTENSION_ENTRY("OpenGL 2.0",glBindAttribLocation,Program -> AttribLocation -> Ptr GLchar -> IO ())- --------------------------------------------------------------------------------  -- Table 2.9 of the OpenGL 3.1 spec: OpenGL Shading Language type tokens@@ -467,68 +412,68 @@  unmarshalVariableType :: GLenum -> VariableType unmarshalVariableType x-   | x == 0x1406 = Float'-   | x == 0x8B50 = FloatVec2-   | x == 0x8B51 = FloatVec3-   | x == 0x8B52 = FloatVec4-   | x == 0x1404 = Int'-   | x == 0x8B53 = IntVec2-   | x == 0x8B54 = IntVec3-   | x == 0x8B55 = IntVec4-   | x == 0x1405 = UnsignedInt'-   | x == 0x8DC6 = UnsignedIntVec2-   | x == 0x8DC7 = UnsignedIntVec3-   | x == 0x8DC8 = UnsignedIntVec4-   | x == 0x8B56 = Bool-   | x == 0x8B57 = BoolVec2-   | x == 0x8B58 = BoolVec3-   | x == 0x8B59 = BoolVec4-   | x == 0x8B5A = FloatMat2-   | x == 0x8B5B = FloatMat3-   | x == 0x8B5C = FloatMat4-   | x == 0x8B65 = FloatMat2x3-   | x == 0x8B66 = FloatMat2x4-   | x == 0x8B67 = FloatMat3x2-   | x == 0x8B68 = FloatMat3x4-   | x == 0x8B69 = FloatMat4x2-   | x == 0x8B6A = FloatMat4x3-   | x == 0x8B5D = Sampler1D-   | x == 0x8B5E = Sampler2D-   | x == 0x8B5F = Sampler3D-   | x == 0x8B60 = SamplerCube-   | x == 0x8B61 = Sampler1DShadow-   | x == 0x8B62 = Sampler2DShadow-   | x == 0x8DC0 = Sampler1DArray-   | x == 0x8DC1 = Sampler2DArray-   | x == 0x8DC3 = Sampler1DArrayShadow-   | x == 0x8DC4 = Sampler2DArrayShadow-   | x == 0x8DC5 = SamplerCubeShadow-   | x == 0x8B63 = Sampler2DRect-   | x == 0x8B64 = Sampler2DRectShadow-   | x == 0x8DC9 = IntSampler1D-   | x == 0x8DCA = IntSampler2D-   | x == 0x8DCB = IntSampler3D-   | x == 0x8DCC = IntSamplerCube-   | x == 0x8DCE = IntSampler1DArray-   | x == 0x8DCF = IntSampler2DArray-   | x == 0x8DD1 = UnsignedIntSampler1D-   | x == 0x8DD2 = UnsignedIntSampler2D-   | x == 0x8DD3 = UnsignedIntSampler3D-   | x == 0x8DD4 = UnsignedIntSamplerCube-   | x == 0x8DD6 = UnsignedIntSampler1DArray-   | x == 0x8DD7 = UnsignedIntSampler2DArray+   | x == gl_FLOAT = Float'+   | x == gl_FLOAT_VEC2 = FloatVec2+   | x == gl_FLOAT_VEC3 = FloatVec3+   | x == gl_FLOAT_VEC4 = FloatVec4+   | x == gl_INT = Int'+   | x == gl_INT_VEC2 = IntVec2+   | x == gl_INT_VEC3 = IntVec3+   | x == gl_INT_VEC4 = IntVec4+   | x == gl_UNSIGNED_INT = UnsignedInt'+   | x == gl_UNSIGNED_INT_VEC2 = UnsignedIntVec2+   | x == gl_UNSIGNED_INT_VEC3 = UnsignedIntVec3+   | x == gl_UNSIGNED_INT_VEC4 = UnsignedIntVec4+   | x == gl_BOOL = Bool+   | x == gl_BOOL_VEC2 = BoolVec2+   | x == gl_BOOL_VEC3 = BoolVec3+   | x == gl_BOOL_VEC4 = BoolVec4+   | x == gl_FLOAT_MAT2 = FloatMat2+   | x == gl_FLOAT_MAT3 = FloatMat3+   | x == gl_FLOAT_MAT4 = FloatMat4+   | x == gl_FLOAT_MAT2x3 = FloatMat2x3+   | x == gl_FLOAT_MAT2x4 = FloatMat2x4+   | x == gl_FLOAT_MAT3x2 = FloatMat3x2+   | x == gl_FLOAT_MAT3x4 = FloatMat3x4+   | x == gl_FLOAT_MAT4x2 = FloatMat4x2+   | x == gl_FLOAT_MAT4x3 = FloatMat4x3+   | x == gl_SAMPLER_1D = Sampler1D+   | x == gl_SAMPLER_2D = Sampler2D+   | x == gl_SAMPLER_3D = Sampler3D+   | x == gl_SAMPLER_CUBE = SamplerCube+   | x == gl_SAMPLER_1D_SHADOW = Sampler1DShadow+   | x == gl_SAMPLER_2D_SHADOW = Sampler2DShadow+   | x == gl_SAMPLER_1D_ARRAY = Sampler1DArray+   | x == gl_SAMPLER_2D_ARRAY = Sampler2DArray+   | x == gl_SAMPLER_1D_ARRAY_SHADOW = Sampler1DArrayShadow+   | x == gl_SAMPLER_2D_ARRAY_SHADOW = Sampler2DArrayShadow+   | x == gl_SAMPLER_CUBE_SHADOW = SamplerCubeShadow+   | x == gl_SAMPLER_2D_RECT = Sampler2DRect+   | x == gl_SAMPLER_2D_RECT_SHADOW = Sampler2DRectShadow+   | x == gl_INT_SAMPLER_1D = IntSampler1D+   | x == gl_INT_SAMPLER_2D = IntSampler2D+   | x == gl_INT_SAMPLER_3D = IntSampler3D+   | x == gl_INT_SAMPLER_CUBE = IntSamplerCube+   | x == gl_INT_SAMPLER_1D_ARRAY = IntSampler1DArray+   | x == gl_INT_SAMPLER_2D_ARRAY = IntSampler2DArray+   | x == gl_UNSIGNED_INT_SAMPLER_1D = UnsignedIntSampler1D+   | x == gl_UNSIGNED_INT_SAMPLER_2D = UnsignedIntSampler2D+   | x == gl_UNSIGNED_INT_SAMPLER_3D = UnsignedIntSampler3D+   | x == gl_UNSIGNED_INT_SAMPLER_CUBE = UnsignedIntSamplerCube+   | x == gl_UNSIGNED_INT_SAMPLER_1D_ARRAY = UnsignedIntSampler1DArray+   | x == gl_UNSIGNED_INT_SAMPLER_2D_ARRAY = UnsignedIntSampler2DArray    | otherwise = error ("unmarshalVariableType: illegal value " ++ show x)  --------------------------------------------------------------------------------  activeVars :: (Program -> GettableStateVar GLuint)            -> (Program -> GettableStateVar GLsizei)-           -> (Program -> GLuint -> GLsizei -> Ptr GLsizei -> Ptr GLint -> Ptr GLenum -> Ptr GLchar -> IO ())+           -> (GLuint -> GLuint -> GLsizei -> Ptr GLsizei -> Ptr GLint -> Ptr GLenum -> Ptr GLchar -> IO ())            -> Program -> GettableStateVar [(GLint,VariableType,String)]-activeVars numVars maxLength getter program =+activeVars numVars maxLength getter p@(Program program) =    makeGettableStateVar $ do-      numActiveVars <- get (numVars program)-      maxLen <- get (maxLength program)+      numActiveVars <- get (numVars p)+      maxLen <- get (maxLength p)       allocaArray (fromIntegral maxLen) $ \nameBuf ->          alloca $ \nameLengthBuf ->             alloca $ \sizeBuf ->@@ -544,29 +489,23 @@ activeAttribs :: Program -> GettableStateVar [(GLint,VariableType,String)] activeAttribs = activeVars activeAttributes activeAttributeMaxLength glGetActiveAttrib -EXTENSION_ENTRY("OpenGL 2.0",glGetActiveAttrib,Program -> GLuint -> GLsizei -> Ptr GLsizei -> Ptr GLint -> Ptr GLenum -> Ptr GLchar -> IO ())- --------------------------------------------------------------------------------  newtype UniformLocation = UniformLocation GLint    deriving ( Eq, Ord, Show )  uniformLocation :: Program -> String -> GettableStateVar UniformLocation-uniformLocation program name =+uniformLocation (Program program) name =    makeGettableStateVar $       fmap UniformLocation $          withGLString name $             glGetUniformLocation program -EXTENSION_ENTRY("OpenGL 2.0",glGetUniformLocation,Program -> Ptr GLchar -> IO GLint)- --------------------------------------------------------------------------------  activeUniforms :: Program -> GettableStateVar [(GLint,VariableType,String)] activeUniforms = activeVars numActiveUniforms activeUniformMaxLength glGetActiveUniform -EXTENSION_ENTRY("OpenGL 2.0",glGetActiveUniform,Program -> GLuint -> GLsizei -> Ptr GLsizei -> Ptr GLint -> Ptr GLenum -> Ptr GLchar -> IO ())- --------------------------------------------------------------------------------  class Storable a => UniformComponent a where@@ -582,98 +521,47 @@    uniform3v :: UniformLocation -> GLsizei -> Ptr a -> IO ()    uniform4v :: UniformLocation -> GLsizei -> Ptr a -> IO () -----------------------------------------------------------------------------------EXTENSION_ENTRY("OpenGL 2.0",glUniform1i,UniformLocation -> GLint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform2i,UniformLocation -> GLint -> GLint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform3i,UniformLocation -> GLint -> GLint -> GLint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform4i,UniformLocation -> GLint -> GLint -> GLint -> GLint -> IO ())--EXTENSION_ENTRY("OpenGL 2.0",glGetUniformiv,Program -> UniformLocation -> Ptr GLint -> IO ())--EXTENSION_ENTRY("OpenGL 2.0",glUniform1iv,UniformLocation -> GLsizei -> Ptr GLint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform2iv,UniformLocation -> GLsizei -> Ptr GLint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform3iv,UniformLocation -> GLsizei -> Ptr GLint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform4iv,UniformLocation -> GLsizei -> Ptr GLint -> IO ())--instance UniformComponent GLint_ where-   uniform1 = glUniform1i-   uniform2 = glUniform2i-   uniform3 = glUniform3i-   uniform4 = glUniform4i--   getUniform program location = glGetUniformiv program location . castPtr--   uniform1v = glUniform1iv-   uniform2v = glUniform2iv-   uniform3v = glUniform3iv-   uniform4v = glUniform4iv------------------------------------------------------------------------------------EXTENSION_ENTRY("OpenGL 2.0",glUniform1ui,UniformLocation -> GLuint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform2ui,UniformLocation -> GLuint -> GLuint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform3ui,UniformLocation -> GLuint -> GLuint -> GLuint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform4ui,UniformLocation -> GLuint -> GLuint -> GLuint -> GLuint -> IO ())--EXTENSION_ENTRY("OpenGL 2.0",glGetUniformuiv,Program -> UniformLocation -> Ptr GLuint -> IO ())--EXTENSION_ENTRY("OpenGL 2.0",glUniform1uiv,UniformLocation -> GLsizei -> Ptr GLuint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform2uiv,UniformLocation -> GLsizei -> Ptr GLuint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform3uiv,UniformLocation -> GLsizei -> Ptr GLuint -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform4uiv,UniformLocation -> GLsizei -> Ptr GLuint -> IO ())--instance UniformComponent GLuint_ where-   uniform1 = glUniform1ui-   uniform2 = glUniform2ui-   uniform3 = glUniform3ui-   uniform4 = glUniform4ui--   getUniform program location = glGetUniformuiv program location . castPtr--   uniform1v = glUniform1uiv-   uniform2v = glUniform2uiv-   uniform3v = glUniform3uiv-   uniform4v = glUniform4uiv----------------------------------------------------------------------------------+-- GLint instance+instance UniformComponent CInt where+   uniform1 (UniformLocation ul) = glUniform1i ul+   uniform2 (UniformLocation ul) = glUniform2i ul+   uniform3 (UniformLocation ul) = glUniform3i ul+   uniform4 (UniformLocation ul) = glUniform4i ul -EXTENSION_ENTRY("OpenGL 2.0",glUniform1f,UniformLocation -> GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform2f,UniformLocation -> GLfloat -> GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform3f,UniformLocation -> GLfloat -> GLfloat -> GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform4f,UniformLocation -> GLfloat -> GLfloat -> GLfloat -> GLfloat -> IO ())+   getUniform (Program p) (UniformLocation ul) = glGetUniformiv p ul . castPtr -EXTENSION_ENTRY("OpenGL 2.0",glGetUniformfv,Program -> UniformLocation -> Ptr GLfloat -> IO ())+   uniform1v (UniformLocation ul) = glUniform1iv ul+   uniform2v (UniformLocation ul) = glUniform2iv ul+   uniform3v (UniformLocation ul) = glUniform3iv ul+   uniform4v (UniformLocation ul) = glUniform4iv ul -EXTENSION_ENTRY("OpenGL 2.0",glUniform1fv,UniformLocation -> GLsizei -> Ptr GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform2fv,UniformLocation -> GLsizei -> Ptr GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform3fv,UniformLocation -> GLsizei -> Ptr GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniform4fv,UniformLocation -> GLsizei -> Ptr GLfloat -> IO ())+-- GLuint instance+instance UniformComponent CUInt where+   uniform1 (UniformLocation ul) = glUniform1ui ul+   uniform2 (UniformLocation ul) = glUniform2ui ul+   uniform3 (UniformLocation ul) = glUniform3ui ul+   uniform4 (UniformLocation ul) = glUniform4ui ul -instance UniformComponent GLfloat_ where-   uniform1 = glUniform1f-   uniform2 = glUniform2f-   uniform3 = glUniform3f-   uniform4 = glUniform4f+   getUniform (Program p) (UniformLocation ul) = glGetUniformuiv p ul . castPtr -   getUniform program location = glGetUniformfv program location . castPtr+   uniform1v (UniformLocation ul) = glUniform1uiv ul+   uniform2v (UniformLocation ul) = glUniform2uiv ul+   uniform3v (UniformLocation ul) = glUniform3uiv ul+   uniform4v (UniformLocation ul) = glUniform4uiv ul -   uniform1v = glUniform1fv-   uniform2v = glUniform2fv-   uniform3v = glUniform3fv-   uniform4v = glUniform4fv+-- GLfloat instance+instance UniformComponent CFloat where+   uniform1 (UniformLocation ul) = glUniform1f ul+   uniform2 (UniformLocation ul) = glUniform2f ul+   uniform3 (UniformLocation ul) = glUniform3f ul+   uniform4 (UniformLocation ul) = glUniform4f ul ---------------------------------------------------------------------------------+   getUniform (Program p) (UniformLocation ul) = glGetUniformfv p ul . castPtr -EXTENSION_ENTRY("OpenGL 2.0",glUniformMatrix2fv,UniformLocation -> GLsizei -> GLboolean -> Ptr GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniformMatrix3fv,UniformLocation -> GLsizei -> GLboolean -> Ptr GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.0",glUniformMatrix4fv,UniformLocation -> GLsizei -> GLboolean -> Ptr GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.1",glUniformMatrix2x3fv,UniformLocation -> GLsizei -> GLboolean -> Ptr GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.1",glUniformMatrix3x2fv,UniformLocation -> GLsizei -> GLboolean -> Ptr GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.1",glUniformMatrix2x4fv,UniformLocation -> GLsizei -> GLboolean -> Ptr GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.1",glUniformMatrix4x2fv,UniformLocation -> GLsizei -> GLboolean -> Ptr GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.1",glUniformMatrix3x4fv,UniformLocation -> GLsizei -> GLboolean -> Ptr GLfloat -> IO ())-EXTENSION_ENTRY("OpenGL 2.1",glUniformMatrix4x3fv,UniformLocation -> GLsizei -> GLboolean -> Ptr GLfloat -> IO ())+   uniform1v (UniformLocation ul) = glUniform1fv ul+   uniform2v (UniformLocation ul) = glUniform2fv ul+   uniform3v (UniformLocation ul) = glUniform3fv ul+   uniform4v (UniformLocation ul) = glUniform4fv ul  --------------------------------------------------------------------------------