Permalink
Browse files

Fixes some types used in the output.

  • Loading branch information...
1 parent b57bbae commit 242f31b145482ce441a14145a096f849de88d44c @Laar committed Mar 28, 2013
Showing with 9 additions and 9 deletions.
  1. +3 −3 BuildSources/Types.hs
  2. BIN referenceoutput.tar.gz
  3. +6 −6 src/Spec/Parsing.hs
View
@@ -47,10 +47,10 @@ type GLuint64 = Word64
-- Not part of the core, but it is very handy to define this here
type GLhandle = CUInt
type GLsync = Ptr ()
+type GLvdpauSurface = GLintptr
newtype CLevent = CLEvent (Ptr CLevent)
newtype CLcontext = CLContext (Ptr CLcontext)
-- both are actually function pointers
-newtype GLdebugprocARB = GLdebugprocARB (Ptr GLdebugprocARB)
-newtype GLdebugprocAMD = GLdebugprocAMD (Ptr GLdebugprocAMD)
-newtype GLdebugproc = GLdebugproc (Ptr GLdebugproc)
+type GLdebugproc = FunPtr (GLenum -> GLenum -> GLuint -> GLenum -> GLsizei
+ -> Ptr GLchar -> Ptr () -> IO ())
View
Binary file not shown.
View
@@ -159,7 +159,7 @@ convertRetType rt = case rt of
Float32 -> TCon "GLfloat"
FramebufferStatus -> TCon "GLenum" -- lookup
GLEnum -> TCon "GLenum"
- HandleARB -> TCon "GLuint" -- lookup
+ HandleARB -> TCon "GLhandle"
Int32 -> TCon "GLint"
Path -> TCon "GLuint" -- lookup, seems to be an object
S.List -> TCon "GLuint" -- lookup
@@ -197,8 +197,8 @@ lookupType t p tm = case M.lookup t tm of
-- GLenumWithTrailingComma -- removed from the source
GLfloat -> TCon "GLfloat"
UnderscoreGLfuncptr -> error "_GLfuncptr"
- GLhalfNV -> TCon "GLushort" -- lookup
- GLhandleARB -> TCon "GLhandle"--tyCon' "GLuint" -- lookup
+ GLhalfNV -> TCon "GLhalf"
+ GLhandleARB -> TCon "GLhandle"
GLint -> TCon "GLint"
GLint64 -> TCon "GLint64"
GLint64EXT -> TCon "GLint64"
@@ -220,9 +220,9 @@ lookupType t p tm = case M.lookup t tm of
GLUtesselator -> error "tesselator"
GLvoid -> TVar
GLvoidStarConst -> TPtr TVar -- TODO lookup ??, only used in MultiModeDrawElementsIBM
- GLvdpauSurfaceNV -> TCon "GLintptr" -- lookup
+ GLvdpauSurfaceNV -> TCon "GLvdpauSurface" -- lookup
GLdebugproc -> TCon "GLdebugproc"
- GLdebugprocARB -> TCon "GLdebugprocARB" -- lookup
- GLdebugprocAMD -> TCon "GLdebugprocAMD" -- lookup
+ GLdebugprocARB -> TCon "GLdebugproc"
+ GLdebugprocAMD -> TCon "GLdebugproc"
-----------------------------------------------------------------------------

0 comments on commit 242f31b

Please sign in to comment.