Skip to content

Commit fdd4b42

Browse files
dagitdagit
committed
dumb down our CPP so that it works in both traditional and ansi modes
1 parent cae93e2 commit fdd4b42

File tree

79 files changed

+1455
-1453
lines changed

Some content is hidden

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

79 files changed

+1455
-1453
lines changed

‎include/HsOpenGLRaw.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@
1515
#ifndef HSOPENGLRAW_H
1616
#define HSOPENGLRAW_H
1717

18+
#define HASH #
19+
1820
/* NOTE: The macro must immediately start with the foreign declaration,
1921
otherwise the magic mangler (hack_foreign) in the Hugs build system
2022
doesn't recognize it. */
21-
#define EXTENSION_ENTRY(_entry,_ty) \
22-
foreign import CALLCONV unsafe "dynamic" dyn_/**/_entry :: Graphics.Rendering.OpenGL.Raw.Extensions.Invoker (_ty) ; \
23+
#define EXTENSION_ENTRY(dyn_entry, ptr_entry, _entry, _ty) \
24+
foreign import CALLCONV unsafe "dynamic" dyn_entry :: Graphics.Rendering.OpenGL.Raw.Extensions.Invoker (_ty) ; \
2325
_entry :: (_ty) ; \
24-
_entry = dyn_/**/_entry ptr_/**/_entry ; \
25-
ptr_/**/_entry :: FunPtr a ; \
26-
ptr_/**/_entry = unsafePerformIO (Graphics.Rendering.OpenGL.Raw.Extensions.getExtensionEntry extensionNameString "_entry") ; \
27-
{-# NOINLINE ptr_/**/_entry #-}
26+
_entry = dyn_entry ptr_entry ; \
27+
ptr_entry :: FunPtr a ; \
28+
ptr_entry = unsafePerformIO (Graphics.Rendering.OpenGL.Raw.Extensions.getExtensionEntry extensionNameString "_entry") ; \
29+
{-HASH NOINLINE ptr_entry HASH-}
2830

2931
#endif

‎src/Graphics/Rendering/OpenGL/Raw/APPLE/FlushBufferRange.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import Graphics.Rendering.OpenGL.Raw.Extensions
3636
extensionNameString :: String
3737
extensionNameString = "GL_APPLE_flush_buffer_range"
3838

39-
EXTENSION_ENTRY(glBufferParameteri, GLenum -> GLenum -> GLint -> IO ())
39+
EXTENSION_ENTRY(dyn_glBufferParameteri,ptr_glBufferParameteri,glBufferParameteri, GLenum -> GLenum -> GLint -> IO ())
4040

4141
gl__BUFFER_SERIALIZED_MODIFY :: GLenum
4242
gl__BUFFER_SERIALIZED_MODIFY = 0x8A12

‎src/Graphics/Rendering/OpenGL/Raw/APPLE/VertexArrayObject.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ import Graphics.Rendering.OpenGL.Raw.Extensions
3737
extensionNameString :: String
3838
extensionNameString = "GL_APPLE_vertex_array_object"
3939

40-
EXTENSION_ENTRY(glBindVertexArrayAPPLE,GLuint -> IO ())
40+
EXTENSION_ENTRY(dyn_glBindVertexArrayAPPLE,ptr_glBindVertexArrayAPPLE,glBindVertexArrayAPPLE,GLuint -> IO ())

‎src/Graphics/Rendering/OpenGL/Raw/ARB/BlendFuncExtended.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ import Graphics.Rendering.OpenGL.Raw.Extensions
4040
extensionNameString :: String
4141
extensionNameString = "GL_ARB_blend_func_extended"
4242

43-
EXTENSION_ENTRY(glBindFragDataLocationIndexed,GLuint -> GLuint -> GLuint -> Ptr GLchar -> IO ())
44-
EXTENSION_ENTRY(glGetFragDataIndex,GLuint -> Ptr GLchar -> IO GLint)
43+
EXTENSION_ENTRY(dyn_glBindFragDataLocationIndexed,ptr_glBindFragDataLocationIndexed,glBindFragDataLocationIndexed,GLuint -> GLuint -> GLuint -> Ptr GLchar -> IO ())
44+
EXTENSION_ENTRY(dyn_glGetFragDataIndex,ptr_glGetFragDataIndex,glGetFragDataIndex,GLuint -> Ptr GLchar -> IO GLint)
4545

4646
gl_SRC1_COLOR :: GLenum
4747
gl_SRC1_COLOR = 0x88F9

‎src/Graphics/Rendering/OpenGL/Raw/ARB/Compatibility/Functions.hs

Lines changed: 382 additions & 382 deletions
Large diffs are not rendered by default.

‎src/Graphics/Rendering/OpenGL/Raw/ARB/ComputeShader.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ import Graphics.Rendering.OpenGL.Raw.Core31.Types
4848
extensionNameString :: String
4949
extensionNameString = "GL_ARB_compute_shader"
5050

51-
EXTENSION_ENTRY(glDispatchCompute,GLuint -> GLuint -> GLuint -> IO ())
52-
EXTENSION_ENTRY(glDispatchComputeIndirect,GLintptr -> IO ())
51+
EXTENSION_ENTRY(dyn_glDispatchCompute,ptr_glDispatchCompute,glDispatchCompute,GLuint -> GLuint -> GLuint -> IO ())
52+
EXTENSION_ENTRY(dyn_glDispatchComputeIndirect,ptr_glDispatchComputeIndirect,glDispatchComputeIndirect,GLintptr -> IO ())
5353

5454
gl_COMPUTE_SHADER :: GLenum
5555
gl_COMPUTE_SHADER = 0x91B9

‎src/Graphics/Rendering/OpenGL/Raw/ARB/CopyBuffer.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import Graphics.Rendering.OpenGL.Raw.Core31.Types
3232
extensionNameString :: String
3333
extensionNameString = "GL_ARB_copy_buffer"
3434

35-
EXTENSION_ENTRY(glCopyBufferSubData,GLenum -> GLenum -> GLintptr -> GLintptr -> GLsizeiptr -> IO ())
35+
EXTENSION_ENTRY(dyn_glCopyBufferSubData,ptr_glCopyBufferSubData,glCopyBufferSubData,GLenum -> GLenum -> GLintptr -> GLintptr -> GLsizeiptr -> IO ())
3636

3737
gl_COPY_READ_BUFFER_BINDING :: GLenum
3838
gl_COPY_READ_BUFFER_BINDING = 0x8F36

‎src/Graphics/Rendering/OpenGL/Raw/ARB/DrawBuffersBlend.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import Graphics.Rendering.OpenGL.Raw.Extensions
3131
extensionNameString :: String
3232
extensionNameString = "GL_ARB_draw_buffers_blend"
3333

34-
EXTENSION_ENTRY(glBlendEquationi,GLuint -> GLenum -> IO ())
35-
EXTENSION_ENTRY(glBlendEquationSeparatei,GLuint -> GLenum -> GLenum -> IO ())
36-
EXTENSION_ENTRY(glBlendFunci,GLuint -> GLenum -> GLenum -> IO ())
37-
EXTENSION_ENTRY(glBlendFuncSeparatei,GLuint -> GLenum -> GLenum -> GLenum -> GLenum -> IO ())
34+
EXTENSION_ENTRY(dyn_glBlendEquationi,ptr_glBlendEquationi,glBlendEquationi,GLuint -> GLenum -> IO ())
35+
EXTENSION_ENTRY(dyn_glBlendEquationSeparatei,ptr_glBlendEquationSeparatei,glBlendEquationSeparatei,GLuint -> GLenum -> GLenum -> IO ())
36+
EXTENSION_ENTRY(dyn_glBlendFunci,ptr_glBlendFunci,glBlendFunci,GLuint -> GLenum -> GLenum -> IO ())
37+
EXTENSION_ENTRY(dyn_glBlendFuncSeparatei,ptr_glBlendFuncSeparatei,glBlendFuncSeparatei,GLuint -> GLenum -> GLenum -> GLenum -> GLenum -> IO ())
3838

‎src/Graphics/Rendering/OpenGL/Raw/ARB/DrawElementsBaseVertex.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import Graphics.Rendering.OpenGL.Raw.Core31.Types
3232
extensionNameString :: String
3333
extensionNameString = "GL_ARB_draw_elements_base_vertex"
3434

35-
EXTENSION_ENTRY(glDrawElementsBaseVertex,GLenum -> GLsizei -> GLenum -> Ptr a -> GLint -> IO ())
36-
EXTENSION_ENTRY(glDrawRangeElementsBaseVertex,GLenum -> GLuint -> GLuint -> GLsizei -> GLenum -> Ptr a -> GLint -> IO ())
37-
EXTENSION_ENTRY(glDrawElementsInstancedBaseVertex,GLenum -> GLsizei -> GLenum -> Ptr a -> GLsizei -> GLint -> IO ())
38-
EXTENSION_ENTRY(glMultiDrawElementsBaseVertex,GLenum -> Ptr GLsizei -> GLenum -> Ptr (Ptr a) -> GLsizei -> Ptr GLint -> IO ())
35+
EXTENSION_ENTRY(dyn_glDrawElementsBaseVertex,ptr_glDrawElementsBaseVertex,glDrawElementsBaseVertex,GLenum -> GLsizei -> GLenum -> Ptr a -> GLint -> IO ())
36+
EXTENSION_ENTRY(dyn_glDrawRangeElementsBaseVertex,ptr_glDrawRangeElementsBaseVertex,glDrawRangeElementsBaseVertex,GLenum -> GLuint -> GLuint -> GLsizei -> GLenum -> Ptr a -> GLint -> IO ())
37+
EXTENSION_ENTRY(dyn_glDrawElementsInstancedBaseVertex,ptr_glDrawElementsInstancedBaseVertex,glDrawElementsInstancedBaseVertex,GLenum -> GLsizei -> GLenum -> Ptr a -> GLsizei -> GLint -> IO ())
38+
EXTENSION_ENTRY(dyn_glMultiDrawElementsBaseVertex,ptr_glMultiDrawElementsBaseVertex,glMultiDrawElementsBaseVertex,GLenum -> Ptr GLsizei -> GLenum -> Ptr (Ptr a) -> GLsizei -> Ptr GLint -> IO ())

‎src/Graphics/Rendering/OpenGL/Raw/ARB/DrawIndirect.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import Graphics.Rendering.OpenGL.Raw.Core31.Types
3333
extensionNameString :: String
3434
extensionNameString = "GL_ARB_draw_indirect"
3535

36-
EXTENSION_ENTRY(glDrawArraysIndirect,GLenum -> Ptr a -> IO ())
37-
EXTENSION_ENTRY(glDrawElementsIndirect,GLenum -> GLenum -> Ptr a -> IO ())
36+
EXTENSION_ENTRY(dyn_glDrawArraysIndirect,ptr_glDrawArraysIndirect,glDrawArraysIndirect,GLenum -> Ptr a -> IO ())
37+
EXTENSION_ENTRY(dyn_glDrawElementsIndirect,ptr_glDrawElementsIndirect,glDrawElementsIndirect,GLenum -> GLenum -> Ptr a -> IO ())
3838

3939
gl_DRAW_INDIRECT_BUFFER :: GLenum
4040
gl_DRAW_INDIRECT_BUFFER = 0x8F3F

‎src/Graphics/Rendering/OpenGL/Raw/ARB/DrawInstanced.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ import Graphics.Rendering.OpenGL.Raw.Core31.Types
3030
extensionNameString :: String
3131
extensionNameString = "GL_ARB_draw_instanced"
3232

33-
EXTENSION_ENTRY(glDrawArraysInstanced,GLenum -> GLint -> GLsizei -> GLsizei -> IO ())
34-
EXTENSION_ENTRY(glDrawElementsInstanced,GLenum -> GLsizei -> GLenum -> Ptr a -> GLsizei -> IO ())
33+
EXTENSION_ENTRY(dyn_glDrawArraysInstanced,ptr_glDrawArraysInstanced,glDrawArraysInstanced,GLenum -> GLint -> GLsizei -> GLsizei -> IO ())
34+
EXTENSION_ENTRY(dyn_glDrawElementsInstanced,ptr_glDrawElementsInstanced,glDrawElementsInstanced,GLenum -> GLsizei -> GLenum -> Ptr a -> GLsizei -> IO ())

‎src/Graphics/Rendering/OpenGL/Raw/ARB/ES2Compatibility.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ import Graphics.Rendering.OpenGL.Raw.Extensions
5151
extensionNameString :: String
5252
extensionNameString = "GL_ARB_ES2_compatibility"
5353

54-
EXTENSION_ENTRY(glReleaseShaderCompiler,IO ())
55-
EXTENSION_ENTRY(glShaderBinary,GLsizei -> Ptr GLuint -> GLenum -> Ptr a -> GLsizei -> IO ())
56-
EXTENSION_ENTRY(glGetShaderPrecisionFormat,GLenum -> GLenum -> Ptr GLint -> Ptr GLint -> IO ())
57-
EXTENSION_ENTRY(glDepthRangef,GLfloat -> GLfloat -> IO ())
58-
EXTENSION_ENTRY(glClearDepthf,GLfloat -> IO ())
54+
EXTENSION_ENTRY(dyn_glReleaseShaderCompiler,ptr_glReleaseShaderCompiler,glReleaseShaderCompiler,IO ())
55+
EXTENSION_ENTRY(dyn_glShaderBinary,ptr_glShaderBinary,glShaderBinary,GLsizei -> Ptr GLuint -> GLenum -> Ptr a -> GLsizei -> IO ())
56+
EXTENSION_ENTRY(dyn_glGetShaderPrecisionFormat,ptr_glGetShaderPrecisionFormat,glGetShaderPrecisionFormat,GLenum -> GLenum -> Ptr GLint -> Ptr GLint -> IO ())
57+
EXTENSION_ENTRY(dyn_glDepthRangef,ptr_glDepthRangef,glDepthRangef,GLfloat -> GLfloat -> IO ())
58+
EXTENSION_ENTRY(dyn_glClearDepthf,ptr_glClearDepthf,glClearDepthf,GLfloat -> IO ())
5959

6060
gl_FIXED :: GLenum
6161
gl_FIXED = 0x140C

‎src/Graphics/Rendering/OpenGL/Raw/ARB/FramebufferNoAttachments.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ import Graphics.Rendering.OpenGL.Raw.Types
4242
extensionNameString :: String
4343
extensionNameString = "GL_ARB_framebuffer_no_attachments"
4444

45-
EXTENSION_ENTRY(glFramebufferParameteri,GLenum -> GLenum -> GLint -> IO ())
46-
EXTENSION_ENTRY(glGetFramebufferParameteriv,GLenum -> GLenum -> Ptr GLint)
45+
EXTENSION_ENTRY(dyn_glFramebufferParameteri,ptr_glFramebufferParameteri,glFramebufferParameteri,GLenum -> GLenum -> GLint -> IO ())
46+
EXTENSION_ENTRY(dyn_glGetFramebufferParameteriv,ptr_glGetFramebufferParameteriv,glGetFramebufferParameteriv,GLenum -> GLenum -> Ptr GLint)
4747

4848
gl_FRAMEBUFFER_DEFAULT_WIDTH :: GLenum
4949
gl_FRAMEBUFFER_DEFAULT_WIDTH = 0x9310

‎src/Graphics/Rendering/OpenGL/Raw/ARB/GPUShaderFP64.hs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,24 @@ import Graphics.Rendering.OpenGL.Raw.Extensions
6262
extensionNameString :: String
6363
extensionNameString = "GL_ARB_gpu_shader_fp64"
6464

65-
EXTENSION_ENTRY(glUniform1d,GLint -> GLdouble -> IO ())
66-
EXTENSION_ENTRY(glUniform2d,GLint -> GLdouble -> GLdouble -> IO ())
67-
EXTENSION_ENTRY(glUniform3d,GLint -> GLdouble -> GLdouble -> GLdouble -> IO ())
68-
EXTENSION_ENTRY(glUniform4d,GLint -> GLdouble -> GLdouble -> GLdouble -> GLdouble -> IO ())
69-
EXTENSION_ENTRY(glUniform1dv,GLint -> GLsizei -> Ptr GLdouble -> IO ())
70-
EXTENSION_ENTRY(glUniform2dv,GLint -> GLsizei -> Ptr GLdouble -> IO ())
71-
EXTENSION_ENTRY(glUniform3dv,GLint -> GLsizei -> Ptr GLdouble -> IO ())
72-
EXTENSION_ENTRY(glUniform4dv,GLint -> GLsizei -> Ptr GLdouble -> IO ())
73-
EXTENSION_ENTRY(glUniformMatrix2dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
74-
EXTENSION_ENTRY(glUniformMatrix3dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
75-
EXTENSION_ENTRY(glUniformMatrix4dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
76-
EXTENSION_ENTRY(glUniformMatrix2x3dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
77-
EXTENSION_ENTRY(glUniformMatrix2x4dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
78-
EXTENSION_ENTRY(glUniformMatrix3x2dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
79-
EXTENSION_ENTRY(glUniformMatrix3x4dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
80-
EXTENSION_ENTRY(glUniformMatrix4x2dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
81-
EXTENSION_ENTRY(glUniformMatrix4x3dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
82-
EXTENSION_ENTRY(glGetUniformdv,GLuint -> GLint -> Ptr GLdouble -> IO ())
65+
EXTENSION_ENTRY(dyn_glUniform1d,ptr_glUniform1d,glUniform1d,GLint -> GLdouble -> IO ())
66+
EXTENSION_ENTRY(dyn_glUniform2d,ptr_glUniform2d,glUniform2d,GLint -> GLdouble -> GLdouble -> IO ())
67+
EXTENSION_ENTRY(dyn_glUniform3d,ptr_glUniform3d,glUniform3d,GLint -> GLdouble -> GLdouble -> GLdouble -> IO ())
68+
EXTENSION_ENTRY(dyn_glUniform4d,ptr_glUniform4d,glUniform4d,GLint -> GLdouble -> GLdouble -> GLdouble -> GLdouble -> IO ())
69+
EXTENSION_ENTRY(dyn_glUniform1dv,ptr_glUniform1dv,glUniform1dv,GLint -> GLsizei -> Ptr GLdouble -> IO ())
70+
EXTENSION_ENTRY(dyn_glUniform2dv,ptr_glUniform2dv,glUniform2dv,GLint -> GLsizei -> Ptr GLdouble -> IO ())
71+
EXTENSION_ENTRY(dyn_glUniform3dv,ptr_glUniform3dv,glUniform3dv,GLint -> GLsizei -> Ptr GLdouble -> IO ())
72+
EXTENSION_ENTRY(dyn_glUniform4dv,ptr_glUniform4dv,glUniform4dv,GLint -> GLsizei -> Ptr GLdouble -> IO ())
73+
EXTENSION_ENTRY(dyn_glUniformMatrix2dv,ptr_glUniformMatrix2dv,glUniformMatrix2dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
74+
EXTENSION_ENTRY(dyn_glUniformMatrix3dv,ptr_glUniformMatrix3dv,glUniformMatrix3dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
75+
EXTENSION_ENTRY(dyn_glUniformMatrix4dv,ptr_glUniformMatrix4dv,glUniformMatrix4dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
76+
EXTENSION_ENTRY(dyn_glUniformMatrix2x3dv,ptr_glUniformMatrix2x3dv,glUniformMatrix2x3dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
77+
EXTENSION_ENTRY(dyn_glUniformMatrix2x4dv,ptr_glUniformMatrix2x4dv,glUniformMatrix2x4dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
78+
EXTENSION_ENTRY(dyn_glUniformMatrix3x2dv,ptr_glUniformMatrix3x2dv,glUniformMatrix3x2dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
79+
EXTENSION_ENTRY(dyn_glUniformMatrix3x4dv,ptr_glUniformMatrix3x4dv,glUniformMatrix3x4dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
80+
EXTENSION_ENTRY(dyn_glUniformMatrix4x2dv,ptr_glUniformMatrix4x2dv,glUniformMatrix4x2dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
81+
EXTENSION_ENTRY(dyn_glUniformMatrix4x3dv,ptr_glUniformMatrix4x3dv,glUniformMatrix4x3dv,GLint -> GLsizei -> GLboolean -> Ptr GLdouble -> IO ())
82+
EXTENSION_ENTRY(dyn_glGetUniformdv,ptr_glGetUniformdv,glGetUniformdv,GLuint -> GLint -> Ptr GLdouble -> IO ())
8383

8484
gl_DOUBLE_VEC2 :: GLenum
8585
gl_DOUBLE_VEC2 = 0x8FFC

‎src/Graphics/Rendering/OpenGL/Raw/ARB/GeometryShader4.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ import Graphics.Rendering.OpenGL.Raw.Extensions
5757
extensionNameString :: String
5858
extensionNameString = "GL_ARB_geometry_shader4"
5959

60-
EXTENSION_ENTRY(glProgramParameteri,GLuint -> GLenum -> GLint -> IO ())
61-
EXTENSION_ENTRY(glFramebufferTexture,GLenum -> GLenum -> GLuint -> GLint -> IO ())
62-
EXTENSION_ENTRY(glFramebufferTextureFace,GLenum -> GLenum -> GLuint -> GLint -> GLenum -> IO ())
60+
EXTENSION_ENTRY(dyn_glProgramParameteri,ptr_glProgramParameteri,glProgramParameteri,GLuint -> GLenum -> GLint -> IO ())
61+
EXTENSION_ENTRY(dyn_glFramebufferTexture,ptr_glFramebufferTexture,glFramebufferTexture,GLenum -> GLenum -> GLuint -> GLint -> IO ())
62+
EXTENSION_ENTRY(dyn_glFramebufferTextureFace,ptr_glFramebufferTextureFace,glFramebufferTextureFace,GLenum -> GLenum -> GLuint -> GLint -> GLenum -> IO ())
6363

6464
gl_LINES_ADJACENCY :: GLenum
6565
gl_LINES_ADJACENCY = 0x000A

‎src/Graphics/Rendering/OpenGL/Raw/ARB/GetProgramBinary.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import Graphics.Rendering.OpenGL.Raw.Extensions
3737
extensionNameString :: String
3838
extensionNameString = "GL_ARB_get_program_binary"
3939

40-
EXTENSION_ENTRY(glGetProgramBinary,GLuint -> GLsizei -> Ptr GLsizei -> Ptr GLenum -> Ptr a -> IO ())
41-
EXTENSION_ENTRY(glProgramBinary,GLuint -> GLenum -> Ptr a -> GLsizei -> IO ())
40+
EXTENSION_ENTRY(dyn_glGetProgramBinary,ptr_glGetProgramBinary,glGetProgramBinary,GLuint -> GLsizei -> Ptr GLsizei -> Ptr GLenum -> Ptr a -> IO ())
41+
EXTENSION_ENTRY(dyn_glProgramBinary,ptr_glProgramBinary,glProgramBinary,GLuint -> GLenum -> Ptr a -> GLsizei -> IO ())
4242

4343
gl_PROGRAM_BINARY_RETRIEVABLE_HINT :: GLenum
4444
gl_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257

‎src/Graphics/Rendering/OpenGL/Raw/ARB/InstancedArrays.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import Graphics.Rendering.OpenGL.Raw.Extensions
3030
extensionNameString :: String
3131
extensionNameString = "GL_ARB_instanced_arrays"
3232

33-
EXTENSION_ENTRY(glVertexAttribDivisor,GLuint -> GLuint -> IO ())
33+
EXTENSION_ENTRY(dyn_glVertexAttribDivisor,ptr_glVertexAttribDivisor,glVertexAttribDivisor,GLuint -> GLuint -> IO ())
3434

3535
gl_VERTEX_ATTRIB_ARRAY_DIVISOR :: GLenum
3636
gl_VERTEX_ATTRIB_ARRAY_DIVISOR = 0x88FE

‎src/Graphics/Rendering/OpenGL/Raw/ARB/MatrixPalette.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ import Graphics.Rendering.OpenGL.Raw.Extensions
4444
extensionNameString :: String
4545
extensionNameString = "GL_ARB_matrix_palette"
4646

47-
EXTENSION_ENTRY(glCurrentPaletteMatrix,GLint -> IO ())
48-
EXTENSION_ENTRY(glMatrixIndexubv,GLint -> Ptr GLubyte -> IO ())
49-
EXTENSION_ENTRY(glMatrixIndexusv,GLint -> Ptr GLushort -> IO ())
50-
EXTENSION_ENTRY(glMatrixIndexuiv,GLint -> Ptr GLuint -> IO ())
51-
EXTENSION_ENTRY(glMatrixIndexPointer,GLint -> GLenum -> GLsizei -> Ptr a -> IO ())
47+
EXTENSION_ENTRY(dyn_glCurrentPaletteMatrix,ptr_glCurrentPaletteMatrix,glCurrentPaletteMatrix,GLint -> IO ())
48+
EXTENSION_ENTRY(dyn_glMatrixIndexubv,ptr_glMatrixIndexubv,glMatrixIndexubv,GLint -> Ptr GLubyte -> IO ())
49+
EXTENSION_ENTRY(dyn_glMatrixIndexusv,ptr_glMatrixIndexusv,glMatrixIndexusv,GLint -> Ptr GLushort -> IO ())
50+
EXTENSION_ENTRY(dyn_glMatrixIndexuiv,ptr_glMatrixIndexuiv,glMatrixIndexuiv,GLint -> Ptr GLuint -> IO ())
51+
EXTENSION_ENTRY(dyn_glMatrixIndexPointer,ptr_glMatrixIndexPointer,glMatrixIndexPointer,GLint -> GLenum -> GLsizei -> Ptr a -> IO ())
5252

5353
gl_MATRIX_PALETTE :: GLenum
5454
gl_MATRIX_PALETTE = 0x8840

‎src/Graphics/Rendering/OpenGL/Raw/ARB/ProvokingVertex.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import Graphics.Rendering.OpenGL.Raw.Core31.Types
3333
extensionNameString :: String
3434
extensionNameString = "GL_ARB_provoking_vertex"
3535

36-
EXTENSION_ENTRY(glProvokingVertex,GLenum -> IO ())
36+
EXTENSION_ENTRY(dyn_glProvokingVertex,ptr_glProvokingVertex,glProvokingVertex,GLenum -> IO ())
3737

3838
gl_FIRST_VERTEX_CONVENTION :: GLenum
3939
gl_FIRST_VERTEX_CONVENTION = 0x8E4D

‎src/Graphics/Rendering/OpenGL/Raw/ARB/SampleShading.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import Graphics.Rendering.OpenGL.Raw.Extensions
3131
extensionNameString :: String
3232
extensionNameString = "GL_ARB_sample_shading"
3333

34-
EXTENSION_ENTRY(glMinSampleShading,GLclampf -> IO ())
34+
EXTENSION_ENTRY(dyn_glMinSampleShading,ptr_glMinSampleShading,glMinSampleShading,GLclampf -> IO ())
3535

3636
gl_SAMPLE_SHADING :: GLenum
3737
gl_SAMPLE_SHADING = 0x8C36

‎src/Graphics/Rendering/OpenGL/Raw/ARB/SamplerObjects.hs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,20 @@ import Graphics.Rendering.OpenGL.Raw.Extensions
4747
extensionNameString :: String
4848
extensionNameString = "GL_ARB_sampler_objects"
4949

50-
EXTENSION_ENTRY(glGenSamplers,GLsizei -> Ptr GLuint -> IO ())
51-
EXTENSION_ENTRY(glDeleteSamplers,GLsizei -> Ptr GLuint -> IO ())
52-
EXTENSION_ENTRY(glIsSampler,GLuint -> IO GLboolean)
53-
EXTENSION_ENTRY(glBindSampler,GLuint -> GLuint -> IO ())
54-
EXTENSION_ENTRY(glSamplerParameteri,GLuint -> GLenum -> GLint -> IO ())
55-
EXTENSION_ENTRY(glSamplerParameteriv,GLuint -> GLenum -> Ptr GLint -> IO ())
56-
EXTENSION_ENTRY(glSamplerParameterf,GLuint -> GLenum -> GLfloat -> IO ())
57-
EXTENSION_ENTRY(glSamplerParameterfv,GLuint -> GLenum -> Ptr GLfloat -> IO ())
58-
EXTENSION_ENTRY(glSamplerParameterIiv,GLuint -> GLenum -> Ptr GLint -> IO ())
59-
EXTENSION_ENTRY(glSamplerParameterIuiv,GLuint -> GLenum -> Ptr GLuint -> IO ())
60-
EXTENSION_ENTRY(glGetSamplerParameteriv,GLuint -> GLenum -> Ptr GLint -> IO ())
61-
EXTENSION_ENTRY(glGetSamplerParameterIiv,GLuint -> GLenum -> Ptr GLint -> IO ())
62-
EXTENSION_ENTRY(glGetSamplerParameterfv,GLuint -> GLenum -> Ptr GLfloat -> IO ())
63-
EXTENSION_ENTRY(glGetSamplerParameterIuiv,GLuint -> GLenum -> Ptr GLuint -> IO ())
50+
EXTENSION_ENTRY(dyn_glGenSamplers,ptr_glGenSamplers,glGenSamplers,GLsizei -> Ptr GLuint -> IO ())
51+
EXTENSION_ENTRY(dyn_glDeleteSamplers,ptr_glDeleteSamplers,glDeleteSamplers,GLsizei -> Ptr GLuint -> IO ())
52+
EXTENSION_ENTRY(dyn_glIsSampler,ptr_glIsSampler,glIsSampler,GLuint -> IO GLboolean)
53+
EXTENSION_ENTRY(dyn_glBindSampler,ptr_glBindSampler,glBindSampler,GLuint -> GLuint -> IO ())
54+
EXTENSION_ENTRY(dyn_glSamplerParameteri,ptr_glSamplerParameteri,glSamplerParameteri,GLuint -> GLenum -> GLint -> IO ())
55+
EXTENSION_ENTRY(dyn_glSamplerParameteriv,ptr_glSamplerParameteriv,glSamplerParameteriv,GLuint -> GLenum -> Ptr GLint -> IO ())
56+
EXTENSION_ENTRY(dyn_glSamplerParameterf,ptr_glSamplerParameterf,glSamplerParameterf,GLuint -> GLenum -> GLfloat -> IO ())
57+
EXTENSION_ENTRY(dyn_glSamplerParameterfv,ptr_glSamplerParameterfv,glSamplerParameterfv,GLuint -> GLenum -> Ptr GLfloat -> IO ())
58+
EXTENSION_ENTRY(dyn_glSamplerParameterIiv,ptr_glSamplerParameterIiv,glSamplerParameterIiv,GLuint -> GLenum -> Ptr GLint -> IO ())
59+
EXTENSION_ENTRY(dyn_glSamplerParameterIuiv,ptr_glSamplerParameterIuiv,glSamplerParameterIuiv,GLuint -> GLenum -> Ptr GLuint -> IO ())
60+
EXTENSION_ENTRY(dyn_glGetSamplerParameteriv,ptr_glGetSamplerParameteriv,glGetSamplerParameteriv,GLuint -> GLenum -> Ptr GLint -> IO ())
61+
EXTENSION_ENTRY(dyn_glGetSamplerParameterIiv,ptr_glGetSamplerParameterIiv,glGetSamplerParameterIiv,GLuint -> GLenum -> Ptr GLint -> IO ())
62+
EXTENSION_ENTRY(dyn_glGetSamplerParameterfv,ptr_glGetSamplerParameterfv,glGetSamplerParameterfv,GLuint -> GLenum -> Ptr GLfloat -> IO ())
63+
EXTENSION_ENTRY(dyn_glGetSamplerParameterIuiv,ptr_glGetSamplerParameterIuiv,glGetSamplerParameterIuiv,GLuint -> GLenum -> Ptr GLuint -> IO ())
6464

6565
gl_SAMPLER_BINDING :: GLenum
6666
gl_SAMPLER_BINDING = 0x8919

0 commit comments

Comments
 (0)