Changed type of GL_FALSE/GL_TRUE to GLboolean. Bumped version to 3.1.0.0.

Author: svenpanne

CHANGELOG.md

@@ -1,3 +1,9 @@
+3.1.0.0
+-------
+* Changed the type of `GL_FALSE` and `GL_TRUE` to `GLboolean`, leading to fewer
+  `fromIntegral` calls in user code.
+* Updated OpenGL registry to r32348.
+
 3.0.0.0
 -------
 * Make the `OpenGLRaw` package even more similar to the `gl` package:

OpenGLRaw.cabal

@@ -1,5 +1,5 @@
 name: OpenGLRaw
-version: 3.0.0.0
+version: 3.1.0.0
 synopsis: A raw binding for the OpenGL graphics system
 description:
   OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 graphics system and

RegistryProcessor/src/Main.hs

@@ -665,35 +665,37 @@ inlineCode s = "@" ++ s ++ "@"
 
 -- TODO: Use Either instead of error below?
 toEnumType :: ToEnumType
-toEnumType eNamespace eGroup eType suffix = TypeName $
-  case (eNamespace, eGroup, eType, unTypeSuffix `fmap` suffix) of
+toEnumType eNamespace eGroup eType suffix eName = TypeName $
+  case (eNamespace, eGroup, eType, unTypeSuffix `fmap` suffix, eName) of
     -- glx.xml
-    (Just "GLXStrings", _, _, _) -> "String"
-    (Just ('G':'L':'X':_), _, _, _) -> "CInt"
+    (Just "GLXStrings", _, _, _, _) -> "String"
+    (Just ('G':'L':'X':_), _, _, _, _) -> "CInt"
 
     -- egl.xml
     -- TODO: EGLenum for EGL_OPENGL_API, EGL_OPENGL_ES_API, EGL_OPENVG_API, EGL_OPENVG_IMAGE?
-    (Just ('E':'G':'L':_), _, Nothing, Just "ull") -> "EGLTime"
-    (Just ('E':'G':'L':_), _, _, _) -> "EGLint"
+    (Just ('E':'G':'L':_), _, Nothing, Just "ull", _) -> "EGLTime"
+    (Just ('E':'G':'L':_), _, _, _, _) -> "EGLint"
 
     -- wgl.xml
-    (Just "WGLLayerPlaneMask", _, _, _) -> "UINT"
-    (Just "WGLColorBufferMask", _, _, _) -> "UINT"
-    (Just "WGLContextFlagsMask", _, _, _) -> "INT"
-    (Just "WGLContextProfileMask", _, _, _) -> "INT"
-    (Just "WGLImageBufferMaskI3D" , _, _, _) -> "UINT"
-    (Just "WGLDXInteropMaskNV", _, _, _) -> "GLenum"
-    (Just ('W':'G':'L':_), _, _, _) -> "CInt"
+    (Just "WGLLayerPlaneMask", _, _, _, _) -> "UINT"
+    (Just "WGLColorBufferMask", _, _, _, _) -> "UINT"
+    (Just "WGLContextFlagsMask", _, _, _, _) -> "INT"
+    (Just "WGLContextProfileMask", _, _, _, _) -> "INT"
+    (Just "WGLImageBufferMaskI3D" , _, _, _, _) -> "UINT"
+    (Just "WGLDXInteropMaskNV", _, _, _, _) -> "GLenum"
+    (Just ('W':'G':'L':_), _, _, _, _) -> "CInt"
 
     -- gl.xml
-    (Just "OcclusionQueryEventMaskAMD", _, _, _) -> "GLuint"
-    (Just "GL", Just "PathRenderingTokenNV", _, _) -> "GLubyte"
-    (Just "GL", _, Just "bitmask", _) -> "GLbitfield"
-    (Just "GL", _, Nothing, Just "u") -> "GLuint"
-    (Just "GL", _, Nothing, Just "ull") -> "GLuint64"
-    (Just "GL", _, Nothing, Nothing) -> "GLenum"
-
-    (_, _, _, _) -> error "can't determine enum type"
+    (Just "OcclusionQueryEventMaskAMD", _, _, _, _) -> "GLuint"
+    (Just "GL", Just "SpecialNumbers", _, _, "GL_FALSE") -> "GLboolean"
+    (Just "GL", Just "SpecialNumbers", _, _, "GL_TRUE") -> "GLboolean"
+    (Just "GL", Just "PathRenderingTokenNV", _, _, _) -> "GLubyte"
+    (Just "GL", _, Just "bitmask", _, _) -> "GLbitfield"
+    (Just "GL", _, Nothing, Just "u", _) -> "GLuint"
+    (Just "GL", _, Nothing, Just "ull", _) -> "GLuint64"
+    (Just "GL", _, Nothing, Nothing, _) -> "GLenum"
+
+    (_, _, _, _, _) -> error "can't determine enum type"
 
 isMask :: TypeName -> Bool
 isMask = (== TypeName "GLbitfield")

RegistryProcessor/src/MangledRegistry.hs

@@ -36,7 +36,7 @@ import qualified Numeric as N
 import qualified DeclarationParser as D
 import qualified Registry as R
 
-type ToEnumType = Maybe String -> Maybe String -> Maybe String -> Maybe R.TypeSuffix -> R.TypeName
+type ToEnumType = Maybe String -> Maybe String -> Maybe String -> Maybe R.TypeSuffix -> String -> R.TypeName
 
 parseRegistry :: ToEnumType -> String -> Either String Registry
 parseRegistry toEnumType str = toRegistry toEnumType `fmap` R.parseRegistry str
@@ -118,11 +118,11 @@ data Enum' = Enum {
   enumName :: EnumName
   } deriving (Eq, Ord, Show)
 
-toEnum' :: (Maybe R.TypeSuffix -> R.TypeName) -> R.Enum' -> Enum'
+toEnum' :: (Maybe R.TypeSuffix -> String -> R.TypeName) -> R.Enum' -> Enum'
 toEnum' toTypeName e = Enum {
   enumValue = EnumValue (R.enumValue e),
   enumAPI = API `fmap` R.enumAPI e,
-  enumType = toTypeName (R.enumType e),
+  enumType = toTypeName (R.enumType e) (R.enumName e),
   enumName = EnumName (R.enumName e) }
 
 splitChar :: Char

src/Graphics/GL/Tokens.hs

@@ -2880,7 +2880,7 @@ pattern GL_FACTOR_MIN_AMD = 0x901C :: GLenum
 
 pattern GL_FAILURE_NV = 0x9030 :: GLenum
 
-pattern GL_FALSE = 0 :: GLenum
+pattern GL_FALSE = 0 :: GLboolean
 
 pattern GL_FASTEST = 0x1101 :: GLenum
 
@@ -10252,7 +10252,7 @@ pattern GL_TRIANGLE_STRIP_ADJACENCY_OES = 0x000D :: GLenum
 
 pattern GL_TRIANGULAR_NV = 0x90A5 :: GLenum
 
-pattern GL_TRUE = 1 :: GLenum
+pattern GL_TRUE = 1 :: GLboolean
 
 pattern GL_TYPE = 0x92FA :: GLenum