Added a few missing Eq/Ord/Show instances. Tiny cleanups on the way.

haskell-opengl · Jan 24, 2014 · fc19160 · fc19160
1 parent bdfaacd
commit fc19160
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Graphics/Rendering/OpenGL/GL/Colors.hs b/Graphics/Rendering/OpenGL/GL/Colors.hs
@@ -467,6 +467,7 @@ data ClampTarget =
      ClampVertexColor
    | ClampFragmentColor
    | ClampReadColor
+   deriving ( Eq, Ord, Show )
 
 marshalClampTarget :: ClampTarget -> GLenum
 marshalClampTarget x = case x of
@@ -480,13 +481,13 @@ marshalClampTargetToPName x = case x of
    ClampVertexColor -> GetVertexColorClamp
    ClampReadColor -> GetReadColorClamp
 
-
 --------------------------------------------------------------------------------
 
 data ClampMode =
      ClampOn
    | FixedOnly
    | ClampOff
+   deriving ( Eq, Ord, Show )
 
 marshalClampMode :: ClampMode -> GLenum
 marshalClampMode x = case x of
@@ -505,5 +506,5 @@ unmarshalClampMode x
 
 clampColor :: ClampTarget -> StateVar ClampMode
 clampColor ct = makeStateVar (getClampColor ct) (setClampColor ct)
-   where setClampColor t = glClampColor (marshalClampTarget t) . marshalClampMode
-         getClampColor = getEnum1 unmarshalClampMode . marshalClampTargetToPName
+   where getClampColor = getEnum1 unmarshalClampMode . marshalClampTargetToPName
+         setClampColor t = glClampColor (marshalClampTarget t) . marshalClampMode
diff --git a/Graphics/Rendering/OpenGL/GL/FramebufferObjects/RenderbufferObject.hs b/Graphics/Rendering/OpenGL/GL/FramebufferObjects/RenderbufferObject.hs
@@ -25,6 +25,7 @@ import Graphics.Rendering.OpenGL.Raw
 --------------------------------------------------------------------------------
 
 data RenderbufferObject = RenderbufferObject { renderbufferID :: GLuint}
+   deriving ( Eq, Ord, Show )
 
 instance ObjectName RenderbufferObject where
    isObjectName = fmap unmarshalGLboolean . glIsRenderbuffer . renderbufferID

diff --git a/Graphics/Rendering/OpenGL/GL/FramebufferObjects/RenderbufferObjects.hs b/Graphics/Rendering/OpenGL/GL/FramebufferObjects/RenderbufferObjects.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_HADDOCK hide #-}
 -----------------------------------------------------------------------------
 -- |
--- Module      :  Graphics.Rendering.OpenGL.GL.FramebufferObjects.RendebufferObjects
+-- Module      :  Graphics.Rendering.OpenGL.GL.FramebufferObjects.RenderbufferObjects
 -- Copyright   :  (c) Sven Panne, Lars Corbijn 2011-2013
 -- License     :  BSD3
 --

diff --git a/Graphics/Rendering/OpenGL/GL/PixelRectangles/PixelMap.hs b/Graphics/Rendering/OpenGL/GL/PixelRectangles/PixelMap.hs
@@ -43,6 +43,7 @@ data PixelMapTarget =
    | GToG
    | BToB
    | AToA
+   deriving ( Eq, Ord, Show )
 
 marshalPixelMapTarget :: PixelMapTarget -> GLenum
 marshalPixelMapTarget x = case x of