Re-export basic types. Removed empty ARB_compatiblity. Bumped version to 2.2.0.0.

Author: svenpanne

OpenGLRaw.cabal

@@ -1,8 +1,8 @@
 name: OpenGLRaw
-version: 2.1.0.0
+version: 2.2.0.0
 synopsis: A raw binding for the OpenGL graphics system
 description:
-  OpenGLRaw is a raw Haskell binding for the OpenGL 3.2 graphics system and
+  OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 graphics system and
   lots of OpenGL extensions. It is basically a 1:1 mapping of OpenGL's C API,
   intended as a basis for a nicer interface. OpenGLRaw offers access to all
   necessary functions, tokens and types plus a general facility for loading
@@ -97,7 +97,6 @@ library
     Graphics.Rendering.OpenGL.Raw.ARB.ClearTexture
     Graphics.Rendering.OpenGL.Raw.ARB.ClipControl
     Graphics.Rendering.OpenGL.Raw.ARB.ColorBufferFloat
-    Graphics.Rendering.OpenGL.Raw.ARB.Compatibility
     Graphics.Rendering.OpenGL.Raw.ARB.CompressedTexturePixelStorage
     Graphics.Rendering.OpenGL.Raw.ARB.ComputeShader
     Graphics.Rendering.OpenGL.Raw.ARB.ComputeVariableGroupSize

RegistryProcessor/src/Main.hs

@@ -62,7 +62,6 @@ printFunctions api registry = do
     SI.hPutStrLn h . separate unCommandName . M.keys . commands $registry
     SI.hPutStrLn h ") where"
     SI.hPutStrLn h ""
-    SI.hPutStrLn h "import Foreign.C.Types"
     SI.hPutStrLn h "import Foreign.Marshal.Error ( throwIf )"
     SI.hPutStrLn h "import Foreign.Ptr ( Ptr, FunPtr, nullFunPtr )"
     SI.hPutStrLn h "import System.IO.Unsafe ( unsafePerformIO )"
@@ -168,7 +167,9 @@ nameAndModifications api e =
   (extensionName e,
    [ conditionalModificationModification cm
    | cm <- extensionsRequireRemove e
-   , api `matches` conditionalModificationAPI cm ])
+   , api `matches` conditionalModificationAPI cm
+   -- ARB_compatibility has an empty "require" element only
+   , not . null . modificationInterfaceElements . conditionalModificationModification $ cm ])
 
 supports :: API -> Maybe [API] -> Bool
 _ `supports` Nothing = True

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

@@ -22,7 +22,6 @@ module Graphics.Rendering.OpenGL.Raw.ARB (
   module Graphics.Rendering.OpenGL.Raw.ARB.CLEvent,
   module Graphics.Rendering.OpenGL.Raw.ARB.ClipControl,
   module Graphics.Rendering.OpenGL.Raw.ARB.ColorBufferFloat,
-  module Graphics.Rendering.OpenGL.Raw.ARB.Compatibility,
   module Graphics.Rendering.OpenGL.Raw.ARB.CompressedTexturePixelStorage,
   module Graphics.Rendering.OpenGL.Raw.ARB.ComputeShader,
   module Graphics.Rendering.OpenGL.Raw.ARB.ComputeVariableGroupSize,

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

@@ -3079,7 +3079,6 @@ module Graphics.Rendering.OpenGL.Raw.Functions (
   glWriteMaskEXT
 ) where
 
-import Foreign.C.Types
 import Foreign.Marshal.Error ( throwIf )
 import Foreign.Ptr ( Ptr, FunPtr, nullFunPtr )
 import System.IO.Unsafe ( unsafePerformIO )

src/Graphics/Rendering/OpenGL/Raw/Functions.hs

@@ -56,7 +56,25 @@ module Graphics.Rendering.OpenGL.Raw.Types (
   GLclampx,
   GLhandleARB,
   GLvdpauSurfaceNV,
-  GLeglImageOES
+  GLeglImageOES,
+
+  -- * Re-exports
+  CChar(..),
+  CDouble(..),
+  CFloat(..),
+  CInt(..),
+  CPtrdiff(..),
+  CSChar(..),
+  CShort(..),
+  CUChar(..),
+  CUInt(..),
+  CUShort(..),
+
+  Int64(..),
+  Word64(..),
+
+  FunPtr(..),
+  Ptr(..)
 ) where
 
 import Data.Int