Skip to content

Commit 3377e02

Browse files
svenpannesvenpanne
committed
Use the pattern synonyms from OpenGLRaw/GLURaw.
1 parent 3432365 commit 3377e02

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1942
-1942
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
module Graphics.Rendering.OpenGL.GL (
1717
-- * OpenGL Fundamentals
18-
module Graphics.Rendering.OpenGL.Raw.Types,
18+
module Graphics.GL.Types,
1919
module Graphics.Rendering.OpenGL.GL.FlushFinish,
2020
module Data.ObjectName,
2121

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

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -41,37 +41,37 @@ data BlendingFactor =
4141

4242
marshalBlendingFactor :: BlendingFactor -> GLenum
4343
marshalBlendingFactor x = case x of
44-
Zero -> gl_ZERO
45-
One -> gl_ONE
46-
SrcColor -> gl_SRC_COLOR
47-
OneMinusSrcColor -> gl_ONE_MINUS_SRC_COLOR
48-
DstColor -> gl_DST_COLOR
49-
OneMinusDstColor -> gl_ONE_MINUS_DST_COLOR
50-
SrcAlpha -> gl_SRC_ALPHA
51-
OneMinusSrcAlpha -> gl_ONE_MINUS_SRC_ALPHA
52-
DstAlpha -> gl_DST_ALPHA
53-
OneMinusDstAlpha -> gl_ONE_MINUS_DST_ALPHA
54-
ConstantColor -> gl_CONSTANT_COLOR
55-
OneMinusConstantColor -> gl_ONE_MINUS_CONSTANT_COLOR
56-
ConstantAlpha -> gl_CONSTANT_ALPHA
57-
OneMinusConstantAlpha -> gl_ONE_MINUS_CONSTANT_ALPHA
58-
SrcAlphaSaturate -> gl_SRC_ALPHA_SATURATE
44+
Zero -> GL_ZERO
45+
One -> GL_ONE
46+
SrcColor -> GL_SRC_COLOR
47+
OneMinusSrcColor -> GL_ONE_MINUS_SRC_COLOR
48+
DstColor -> GL_DST_COLOR
49+
OneMinusDstColor -> GL_ONE_MINUS_DST_COLOR
50+
SrcAlpha -> GL_SRC_ALPHA
51+
OneMinusSrcAlpha -> GL_ONE_MINUS_SRC_ALPHA
52+
DstAlpha -> GL_DST_ALPHA
53+
OneMinusDstAlpha -> GL_ONE_MINUS_DST_ALPHA
54+
ConstantColor -> GL_CONSTANT_COLOR
55+
OneMinusConstantColor -> GL_ONE_MINUS_CONSTANT_COLOR
56+
ConstantAlpha -> GL_CONSTANT_ALPHA
57+
OneMinusConstantAlpha -> GL_ONE_MINUS_CONSTANT_ALPHA
58+
SrcAlphaSaturate -> GL_SRC_ALPHA_SATURATE
5959

6060
unmarshalBlendingFactor :: GLenum -> BlendingFactor
6161
unmarshalBlendingFactor x
62-
| x == gl_ZERO = Zero
63-
| x == gl_ONE = One
64-
| x == gl_SRC_COLOR = SrcColor
65-
| x == gl_ONE_MINUS_SRC_COLOR = OneMinusSrcColor
66-
| x == gl_DST_COLOR = DstColor
67-
| x == gl_ONE_MINUS_DST_COLOR = OneMinusDstColor
68-
| x == gl_SRC_ALPHA = SrcAlpha
69-
| x == gl_ONE_MINUS_SRC_ALPHA = OneMinusSrcAlpha
70-
| x == gl_DST_ALPHA = DstAlpha
71-
| x == gl_ONE_MINUS_DST_ALPHA = OneMinusDstAlpha
72-
| x == gl_CONSTANT_COLOR = ConstantColor
73-
| x == gl_ONE_MINUS_CONSTANT_COLOR = OneMinusConstantColor
74-
| x == gl_CONSTANT_ALPHA = ConstantAlpha
75-
| x == gl_ONE_MINUS_CONSTANT_ALPHA = OneMinusConstantAlpha
76-
| x == gl_SRC_ALPHA_SATURATE = SrcAlphaSaturate
62+
| x == GL_ZERO = Zero
63+
| x == GL_ONE = One
64+
| x == GL_SRC_COLOR = SrcColor
65+
| x == GL_ONE_MINUS_SRC_COLOR = OneMinusSrcColor
66+
| x == GL_DST_COLOR = DstColor
67+
| x == GL_ONE_MINUS_DST_COLOR = OneMinusDstColor
68+
| x == GL_SRC_ALPHA = SrcAlpha
69+
| x == GL_ONE_MINUS_SRC_ALPHA = OneMinusSrcAlpha
70+
| x == GL_DST_ALPHA = DstAlpha
71+
| x == GL_ONE_MINUS_DST_ALPHA = OneMinusDstAlpha
72+
| x == GL_CONSTANT_COLOR = ConstantColor
73+
| x == GL_ONE_MINUS_CONSTANT_COLOR = OneMinusConstantColor
74+
| x == GL_CONSTANT_ALPHA = ConstantAlpha
75+
| x == GL_ONE_MINUS_CONSTANT_ALPHA = OneMinusConstantAlpha
76+
| x == GL_SRC_ALPHA_SATURATE = SrcAlphaSaturate
7777
| otherwise = error ("unmarshalBlendingFactor: illegal value " ++ show x)

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,21 @@ data BufferMode =
7171

7272
marshalBufferMode :: BufferMode -> Maybe GLenum
7373
marshalBufferMode x = case x of
74-
NoBuffers -> Just gl_NONE
75-
FrontLeftBuffer -> Just gl_FRONT_LEFT
76-
FrontRightBuffer -> Just gl_FRONT_RIGHT
77-
BackLeftBuffer -> Just gl_BACK_LEFT
78-
BackRightBuffer -> Just gl_BACK_RIGHT
79-
FrontBuffers -> Just gl_FRONT
80-
BackBuffers -> Just gl_BACK
81-
LeftBuffers -> Just gl_LEFT
82-
RightBuffers -> Just gl_RIGHT
83-
FrontAndBackBuffers -> Just gl_FRONT_AND_BACK
74+
NoBuffers -> Just GL_NONE
75+
FrontLeftBuffer -> Just GL_FRONT_LEFT
76+
FrontRightBuffer -> Just GL_FRONT_RIGHT
77+
BackLeftBuffer -> Just GL_BACK_LEFT
78+
BackRightBuffer -> Just GL_BACK_RIGHT
79+
FrontBuffers -> Just GL_FRONT
80+
BackBuffers -> Just GL_BACK
81+
LeftBuffers -> Just GL_LEFT
82+
RightBuffers -> Just GL_RIGHT
83+
FrontAndBackBuffers -> Just GL_FRONT_AND_BACK
8484
AuxBuffer i
85-
| fromIntegral i <= maxAuxBuffer -> Just (gl_AUX0 + fromIntegral i)
85+
| fromIntegral i <= maxAuxBuffer -> Just (GL_AUX0 + fromIntegral i)
8686
| otherwise -> Nothing
8787
FBOColorAttachment i
88-
| fromIntegral i <= maxColorAttachments -> Just (gl_COLOR_ATTACHMENT0 + fromIntegral i)
88+
| fromIntegral i <= maxColorAttachments -> Just (GL_COLOR_ATTACHMENT0 + fromIntegral i)
8989
| otherwise -> Nothing
9090

9191
unmarshalBufferMode :: GLenum -> BufferMode
@@ -94,19 +94,19 @@ unmarshalBufferMode x = maybe
9494

9595
unmarshalBufferModeSafe :: GLenum -> Maybe BufferMode
9696
unmarshalBufferModeSafe x
97-
| x == gl_NONE = Just NoBuffers
98-
| x == gl_FRONT_LEFT = Just FrontLeftBuffer
99-
| x == gl_FRONT_RIGHT = Just FrontRightBuffer
100-
| x == gl_BACK_LEFT = Just BackLeftBuffer
101-
| x == gl_BACK_RIGHT = Just BackRightBuffer
102-
| x == gl_FRONT = Just FrontBuffers
103-
| x == gl_BACK = Just BackBuffers
104-
| x == gl_LEFT = Just LeftBuffers
105-
| x == gl_RIGHT = Just RightBuffers
106-
| x == gl_FRONT_AND_BACK = Just FrontAndBackBuffers
107-
| gl_AUX0 <= x && x <= gl_AUX0 + maxAuxBuffer = Just . AuxBuffer . fromIntegral $ x - gl_AUX0
108-
| gl_COLOR_ATTACHMENT0 <= x && x <= gl_COLOR_ATTACHMENT0 + maxColorAttachments
109-
= Just . FBOColorAttachment . fromIntegral $ x - gl_COLOR_ATTACHMENT0
97+
| x == GL_NONE = Just NoBuffers
98+
| x == GL_FRONT_LEFT = Just FrontLeftBuffer
99+
| x == GL_FRONT_RIGHT = Just FrontRightBuffer
100+
| x == GL_BACK_LEFT = Just BackLeftBuffer
101+
| x == GL_BACK_RIGHT = Just BackRightBuffer
102+
| x == GL_FRONT = Just FrontBuffers
103+
| x == GL_BACK = Just BackBuffers
104+
| x == GL_LEFT = Just LeftBuffers
105+
| x == GL_RIGHT = Just RightBuffers
106+
| x == GL_FRONT_AND_BACK = Just FrontAndBackBuffers
107+
| GL_AUX0 <= x && x <= GL_AUX0 + maxAuxBuffer = Just . AuxBuffer . fromIntegral $ x - GL_AUX0
108+
| GL_COLOR_ATTACHMENT0 <= x && x <= GL_COLOR_ATTACHMENT0 + maxColorAttachments
109+
= Just . FBOColorAttachment . fromIntegral $ x - GL_COLOR_ATTACHMENT0
110110
| otherwise = Nothing
111111

112112
maxAuxBuffer :: GLenum

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

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ instance GeneratableObjectName BufferObject where
7878
fmap (map BufferObject) $ peekArray n buf
7979

8080
instance CanBeLabeled BufferObject where
81-
objectLabel = objectNameLabel gl_BUFFER . bufferID
81+
objectLabel = objectNameLabel GL_BUFFER . bufferID
8282

8383
--------------------------------------------------------------------------------
8484

@@ -101,20 +101,20 @@ data BufferTarget =
101101

102102
marshalBufferTarget :: BufferTarget -> GLenum
103103
marshalBufferTarget x = case x of
104-
ArrayBuffer -> gl_ARRAY_BUFFER
105-
AtomicCounterBuffer -> gl_ATOMIC_COUNTER_BUFFER
106-
CopyReadBuffer -> gl_COPY_READ_BUFFER
107-
CopyWriteBuffer -> gl_COPY_WRITE_BUFFER
108-
DispatchIndirectBuffer -> gl_DISPATCH_INDIRECT_BUFFER
109-
DrawIndirectBuffer -> gl_DRAW_INDIRECT_BUFFER
110-
ElementArrayBuffer -> gl_ELEMENT_ARRAY_BUFFER
111-
PixelPackBuffer -> gl_PIXEL_PACK_BUFFER
112-
PixelUnpackBuffer -> gl_PIXEL_UNPACK_BUFFER
113-
QueryBuffer -> gl_QUERY_BUFFER
114-
ShaderStorageBuffer -> gl_SHADER_STORAGE_BUFFER
115-
TextureBuffer -> gl_TEXTURE_BUFFER
116-
TransformFeedbackBuffer -> gl_TRANSFORM_FEEDBACK_BUFFER
117-
UniformBuffer -> gl_UNIFORM_BUFFER
104+
ArrayBuffer -> GL_ARRAY_BUFFER
105+
AtomicCounterBuffer -> GL_ATOMIC_COUNTER_BUFFER
106+
CopyReadBuffer -> GL_COPY_READ_BUFFER
107+
CopyWriteBuffer -> GL_COPY_WRITE_BUFFER
108+
DispatchIndirectBuffer -> GL_DISPATCH_INDIRECT_BUFFER
109+
DrawIndirectBuffer -> GL_DRAW_INDIRECT_BUFFER
110+
ElementArrayBuffer -> GL_ELEMENT_ARRAY_BUFFER
111+
PixelPackBuffer -> GL_PIXEL_PACK_BUFFER
112+
PixelUnpackBuffer -> GL_PIXEL_UNPACK_BUFFER
113+
QueryBuffer -> GL_QUERY_BUFFER
114+
ShaderStorageBuffer -> GL_SHADER_STORAGE_BUFFER
115+
TextureBuffer -> GL_TEXTURE_BUFFER
116+
TransformFeedbackBuffer -> GL_TRANSFORM_FEEDBACK_BUFFER
117+
UniformBuffer -> GL_UNIFORM_BUFFER
118118

119119
bufferTargetToGetPName :: BufferTarget -> PName1I
120120
bufferTargetToGetPName x = case x of
@@ -149,27 +149,27 @@ data BufferUsage =
149149

150150
marshalBufferUsage :: BufferUsage -> GLenum
151151
marshalBufferUsage x = case x of
152-
StreamDraw -> gl_STREAM_DRAW
153-
StreamRead -> gl_STREAM_READ
154-
StreamCopy -> gl_STREAM_COPY
155-
StaticDraw -> gl_STATIC_DRAW
156-
StaticRead -> gl_STATIC_READ
157-
StaticCopy -> gl_STATIC_COPY
158-
DynamicDraw -> gl_DYNAMIC_DRAW
159-
DynamicRead -> gl_DYNAMIC_READ
160-
DynamicCopy -> gl_DYNAMIC_COPY
152+
StreamDraw -> GL_STREAM_DRAW
153+
StreamRead -> GL_STREAM_READ
154+
StreamCopy -> GL_STREAM_COPY
155+
StaticDraw -> GL_STATIC_DRAW
156+
StaticRead -> GL_STATIC_READ
157+
StaticCopy -> GL_STATIC_COPY
158+
DynamicDraw -> GL_DYNAMIC_DRAW
159+
DynamicRead -> GL_DYNAMIC_READ
160+
DynamicCopy -> GL_DYNAMIC_COPY
161161

162162
unmarshalBufferUsage :: GLenum -> BufferUsage
163163
unmarshalBufferUsage x
164-
| x == gl_STREAM_DRAW = StreamDraw
165-
| x == gl_STREAM_READ = StreamRead
166-
| x == gl_STREAM_COPY = StreamCopy
167-
| x == gl_STATIC_DRAW = StaticDraw
168-
| x == gl_STATIC_READ = StaticRead
169-
| x == gl_STATIC_COPY = StaticCopy
170-
| x == gl_DYNAMIC_DRAW = DynamicDraw
171-
| x == gl_DYNAMIC_READ = DynamicRead
172-
| x == gl_DYNAMIC_COPY = DynamicCopy
164+
| x == GL_STREAM_DRAW = StreamDraw
165+
| x == GL_STREAM_READ = StreamRead
166+
| x == GL_STREAM_COPY = StreamCopy
167+
| x == GL_STATIC_DRAW = StaticDraw
168+
| x == GL_STATIC_READ = StaticRead
169+
| x == GL_STATIC_COPY = StaticCopy
170+
| x == GL_DYNAMIC_DRAW = DynamicDraw
171+
| x == GL_DYNAMIC_READ = DynamicRead
172+
| x == GL_DYNAMIC_COPY = DynamicCopy
173173
| otherwise = error ("unmarshalBufferUsage: illegal value " ++ show x)
174174

175175
--------------------------------------------------------------------------------
@@ -182,15 +182,15 @@ data BufferAccess =
182182

183183
marshalBufferAccess :: BufferAccess -> GLenum
184184
marshalBufferAccess x = case x of
185-
ReadOnly -> gl_READ_ONLY
186-
WriteOnly -> gl_WRITE_ONLY
187-
ReadWrite -> gl_READ_WRITE
185+
ReadOnly -> GL_READ_ONLY
186+
WriteOnly -> GL_WRITE_ONLY
187+
ReadWrite -> GL_READ_WRITE
188188

189189
unmarshalBufferAccess :: GLenum -> BufferAccess
190190
unmarshalBufferAccess x
191-
| x == gl_READ_ONLY = ReadOnly
192-
| x == gl_WRITE_ONLY = WriteOnly
193-
| x == gl_READ_WRITE = ReadWrite
191+
| x == GL_READ_ONLY = ReadOnly
192+
| x == GL_WRITE_ONLY = WriteOnly
193+
| x == GL_READ_WRITE = ReadWrite
194194
| otherwise = error ("unmarshalBufferAccess: illegal value " ++ show x)
195195

196196
--------------------------------------------------------------------------------
@@ -276,10 +276,10 @@ data GetBufferPName =
276276

277277
marshalGetBufferPName :: GetBufferPName -> GLenum
278278
marshalGetBufferPName x = case x of
279-
GetBufferSize -> gl_BUFFER_SIZE
280-
GetBufferUsage -> gl_BUFFER_USAGE
281-
GetBufferAccess -> gl_BUFFER_ACCESS
282-
GetBufferMapped -> gl_BUFFER_MAPPED
279+
GetBufferSize -> GL_BUFFER_SIZE
280+
GetBufferUsage -> GL_BUFFER_USAGE
281+
GetBufferAccess -> GL_BUFFER_ACCESS
282+
GetBufferMapped -> GL_BUFFER_MAPPED
283283

284284
getBufferParameter :: BufferTarget -> (GLenum -> a) -> GetBufferPName -> IO a
285285
getBufferParameter t f p = with 0 $ \buf -> do
@@ -291,7 +291,7 @@ getBufferParameter t f p = with 0 $ \buf -> do
291291

292292
getBufferPointer :: BufferTarget -> IO (Ptr a)
293293
getBufferPointer t = with nullPtr $ \buf -> do
294-
glGetBufferPointerv (marshalBufferTarget t) gl_BUFFER_MAP_POINTER buf
294+
glGetBufferPointerv (marshalBufferTarget t) GL_BUFFER_MAP_POINTER buf
295295
peek1 id buf
296296

297297
--------------------------------------------------------------------------------
@@ -346,12 +346,12 @@ type Length = GLsizeiptr
346346

347347
marshalMapBufferUsage :: MapBufferUsage -> GLbitfield
348348
marshalMapBufferUsage x = case x of
349-
Read -> gl_MAP_READ_BIT
350-
Write -> gl_MAP_WRITE_BIT
351-
InvalidateRange -> gl_MAP_INVALIDATE_RANGE_BIT
352-
InvalidateBuffer -> gl_MAP_INVALIDATE_BUFFER_BIT
353-
FlushExplicit -> gl_MAP_FLUSH_EXPLICIT_BIT
354-
Unsychronized -> gl_MAP_FLUSH_EXPLICIT_BIT
349+
Read -> GL_MAP_READ_BIT
350+
Write -> GL_MAP_WRITE_BIT
351+
InvalidateRange -> GL_MAP_INVALIDATE_RANGE_BIT
352+
InvalidateBuffer -> GL_MAP_INVALIDATE_BUFFER_BIT
353+
FlushExplicit -> GL_MAP_FLUSH_EXPLICIT_BIT
354+
Unsychronized -> GL_MAP_FLUSH_EXPLICIT_BIT
355355

356356
--------------------------------------------------------------------------------
357357

0 commit comments

Comments
 (0)