Use the pattern synonyms from OpenGLRaw/GLURaw.

Author: svenpanne

src/Graphics/Rendering/OpenGL/GL.hs

@@ -15,7 +15,7 @@
 
 module Graphics.Rendering.OpenGL.GL (
    -- * OpenGL Fundamentals
-   module Graphics.Rendering.OpenGL.Raw.Types,
+   module Graphics.GL.Types,
    module Graphics.Rendering.OpenGL.GL.FlushFinish,
    module Data.ObjectName,
 

src/Graphics/Rendering/OpenGL/GL/BlendingFactor.hs

@@ -41,37 +41,37 @@ data BlendingFactor =
 
 marshalBlendingFactor :: BlendingFactor -> GLenum
 marshalBlendingFactor x = case x of
-   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
+   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 == 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
+   | 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)

src/Graphics/Rendering/OpenGL/GL/BufferMode.hs

@@ -71,21 +71,21 @@ data BufferMode =
 
 marshalBufferMode :: BufferMode -> Maybe GLenum
 marshalBufferMode x = case x of
-   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
+   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
-      | fromIntegral i <= maxAuxBuffer -> Just (gl_AUX0 + fromIntegral i)
+      | fromIntegral i <= maxAuxBuffer -> Just (GL_AUX0 + fromIntegral i)
       | otherwise -> Nothing
    FBOColorAttachment i
-      | fromIntegral i <= maxColorAttachments -> Just (gl_COLOR_ATTACHMENT0 + fromIntegral i)
+      | fromIntegral i <= maxColorAttachments -> Just (GL_COLOR_ATTACHMENT0 + fromIntegral i)
       | otherwise -> Nothing
 
 unmarshalBufferMode :: GLenum -> BufferMode
@@ -94,19 +94,19 @@ unmarshalBufferMode x = maybe
 
 unmarshalBufferModeSafe :: GLenum -> Maybe BufferMode
 unmarshalBufferModeSafe x
-   | x == gl_NONE = Just NoBuffers
-   | x == gl_FRONT_LEFT = Just FrontLeftBuffer
-   | x == gl_FRONT_RIGHT = Just FrontRightBuffer
-   | x == gl_BACK_LEFT = Just BackLeftBuffer
-   | x == gl_BACK_RIGHT = Just BackRightBuffer
-   | x == gl_FRONT = Just FrontBuffers
-   | x == gl_BACK = Just BackBuffers
-   | x == gl_LEFT = Just LeftBuffers
-   | x == gl_RIGHT = Just RightBuffers
-   | x == gl_FRONT_AND_BACK = Just FrontAndBackBuffers
-   | gl_AUX0 <= x && x <= gl_AUX0 + maxAuxBuffer = Just . AuxBuffer . fromIntegral $ x - gl_AUX0
-   | gl_COLOR_ATTACHMENT0 <= x && x <= gl_COLOR_ATTACHMENT0 + maxColorAttachments
-      = Just . FBOColorAttachment . fromIntegral $ x - gl_COLOR_ATTACHMENT0
+   | x == GL_NONE = Just NoBuffers
+   | x == GL_FRONT_LEFT = Just FrontLeftBuffer
+   | x == GL_FRONT_RIGHT = Just FrontRightBuffer
+   | x == GL_BACK_LEFT = Just BackLeftBuffer
+   | x == GL_BACK_RIGHT = Just BackRightBuffer
+   | x == GL_FRONT = Just FrontBuffers
+   | x == GL_BACK = Just BackBuffers
+   | x == GL_LEFT = Just LeftBuffers
+   | x == GL_RIGHT = Just RightBuffers
+   | x == GL_FRONT_AND_BACK = Just FrontAndBackBuffers
+   | GL_AUX0 <= x && x <= GL_AUX0 + maxAuxBuffer = Just . AuxBuffer . fromIntegral $ x - GL_AUX0
+   | GL_COLOR_ATTACHMENT0 <= x && x <= GL_COLOR_ATTACHMENT0 + maxColorAttachments
+      = Just . FBOColorAttachment . fromIntegral $ x - GL_COLOR_ATTACHMENT0
    | otherwise = Nothing
 
 maxAuxBuffer :: GLenum

src/Graphics/Rendering/OpenGL/GL/BufferObjects.hs

@@ -78,7 +78,7 @@ instance GeneratableObjectName BufferObject where
         fmap (map BufferObject) $ peekArray n buf
 
 instance CanBeLabeled BufferObject where
-   objectLabel = objectNameLabel gl_BUFFER . bufferID
+   objectLabel = objectNameLabel GL_BUFFER . bufferID
 
 --------------------------------------------------------------------------------
 
@@ -101,20 +101,20 @@ data BufferTarget =
 
 marshalBufferTarget :: BufferTarget -> GLenum
 marshalBufferTarget x = case x of
-   ArrayBuffer -> gl_ARRAY_BUFFER
-   AtomicCounterBuffer -> gl_ATOMIC_COUNTER_BUFFER
-   CopyReadBuffer -> gl_COPY_READ_BUFFER
-   CopyWriteBuffer -> gl_COPY_WRITE_BUFFER
-   DispatchIndirectBuffer -> gl_DISPATCH_INDIRECT_BUFFER
-   DrawIndirectBuffer -> gl_DRAW_INDIRECT_BUFFER
-   ElementArrayBuffer -> gl_ELEMENT_ARRAY_BUFFER
-   PixelPackBuffer -> gl_PIXEL_PACK_BUFFER
-   PixelUnpackBuffer -> gl_PIXEL_UNPACK_BUFFER
-   QueryBuffer -> gl_QUERY_BUFFER
-   ShaderStorageBuffer -> gl_SHADER_STORAGE_BUFFER
-   TextureBuffer -> gl_TEXTURE_BUFFER
-   TransformFeedbackBuffer -> gl_TRANSFORM_FEEDBACK_BUFFER
-   UniformBuffer -> gl_UNIFORM_BUFFER
+   ArrayBuffer -> GL_ARRAY_BUFFER
+   AtomicCounterBuffer -> GL_ATOMIC_COUNTER_BUFFER
+   CopyReadBuffer -> GL_COPY_READ_BUFFER
+   CopyWriteBuffer -> GL_COPY_WRITE_BUFFER
+   DispatchIndirectBuffer -> GL_DISPATCH_INDIRECT_BUFFER
+   DrawIndirectBuffer -> GL_DRAW_INDIRECT_BUFFER
+   ElementArrayBuffer -> GL_ELEMENT_ARRAY_BUFFER
+   PixelPackBuffer -> GL_PIXEL_PACK_BUFFER
+   PixelUnpackBuffer -> GL_PIXEL_UNPACK_BUFFER
+   QueryBuffer -> GL_QUERY_BUFFER
+   ShaderStorageBuffer -> GL_SHADER_STORAGE_BUFFER
+   TextureBuffer -> GL_TEXTURE_BUFFER
+   TransformFeedbackBuffer -> GL_TRANSFORM_FEEDBACK_BUFFER
+   UniformBuffer -> GL_UNIFORM_BUFFER
 
 bufferTargetToGetPName :: BufferTarget -> PName1I
 bufferTargetToGetPName x = case x of
@@ -149,27 +149,27 @@ data BufferUsage =
 
 marshalBufferUsage :: BufferUsage -> GLenum
 marshalBufferUsage x = case x of
-   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
+   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 == 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
+   | 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)
 
 --------------------------------------------------------------------------------
@@ -182,15 +182,15 @@ data BufferAccess =
 
 marshalBufferAccess :: BufferAccess -> GLenum
 marshalBufferAccess x = case x of
-   ReadOnly -> gl_READ_ONLY
-   WriteOnly -> gl_WRITE_ONLY
-   ReadWrite -> gl_READ_WRITE
+   ReadOnly -> GL_READ_ONLY
+   WriteOnly -> GL_WRITE_ONLY
+   ReadWrite -> GL_READ_WRITE
 
 unmarshalBufferAccess :: GLenum -> BufferAccess
 unmarshalBufferAccess x
-   | x == gl_READ_ONLY = ReadOnly
-   | x == gl_WRITE_ONLY = WriteOnly
-   | x == gl_READ_WRITE = ReadWrite
+   | x == GL_READ_ONLY = ReadOnly
+   | x == GL_WRITE_ONLY = WriteOnly
+   | x == GL_READ_WRITE = ReadWrite
    | otherwise = error ("unmarshalBufferAccess: illegal value " ++ show x)
 
 --------------------------------------------------------------------------------
@@ -276,10 +276,10 @@ data GetBufferPName =
 
 marshalGetBufferPName :: GetBufferPName -> GLenum
 marshalGetBufferPName x = case x of
-   GetBufferSize -> gl_BUFFER_SIZE
-   GetBufferUsage -> gl_BUFFER_USAGE
-   GetBufferAccess -> gl_BUFFER_ACCESS
-   GetBufferMapped -> gl_BUFFER_MAPPED
+   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 = with 0 $ \buf -> do
@@ -291,7 +291,7 @@ getBufferParameter t f p = with 0 $ \buf -> do
 
 getBufferPointer :: BufferTarget -> IO (Ptr a)
 getBufferPointer t = with nullPtr $ \buf -> do
-   glGetBufferPointerv (marshalBufferTarget t) gl_BUFFER_MAP_POINTER buf
+   glGetBufferPointerv (marshalBufferTarget t) GL_BUFFER_MAP_POINTER buf
    peek1 id buf
 
 --------------------------------------------------------------------------------
@@ -346,12 +346,12 @@ type Length = GLsizeiptr
 
 marshalMapBufferUsage :: MapBufferUsage -> GLbitfield
 marshalMapBufferUsage x = case x of
-    Read -> gl_MAP_READ_BIT
-    Write -> gl_MAP_WRITE_BIT
-    InvalidateRange -> gl_MAP_INVALIDATE_RANGE_BIT
-    InvalidateBuffer -> gl_MAP_INVALIDATE_BUFFER_BIT
-    FlushExplicit -> gl_MAP_FLUSH_EXPLICIT_BIT
-    Unsychronized -> gl_MAP_FLUSH_EXPLICIT_BIT
+    Read -> GL_MAP_READ_BIT
+    Write -> GL_MAP_WRITE_BIT
+    InvalidateRange -> GL_MAP_INVALIDATE_RANGE_BIT
+    InvalidateBuffer -> GL_MAP_INVALIDATE_BUFFER_BIT
+    FlushExplicit -> GL_MAP_FLUSH_EXPLICIT_BIT
+    Unsychronized -> GL_MAP_FLUSH_EXPLICIT_BIT
 
 --------------------------------------------------------------------------------