Skip to content

Commit fc19160

Browse files
committed
Added a few missing Eq/Ord/Show instances. Tiny cleanups on the way.
1 parent bdfaacd commit fc19160

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

Graphics/Rendering/OpenGL/GL/Colors.hs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,7 @@ data ClampTarget =
467467
ClampVertexColor
468468
| ClampFragmentColor
469469
| ClampReadColor
470+
deriving ( Eq, Ord, Show )
470471

471472
marshalClampTarget :: ClampTarget -> GLenum
472473
marshalClampTarget x = case x of
@@ -480,13 +481,13 @@ marshalClampTargetToPName x = case x of
480481
ClampVertexColor -> GetVertexColorClamp
481482
ClampReadColor -> GetReadColorClamp
482483

483-
484484
--------------------------------------------------------------------------------
485485

486486
data ClampMode =
487487
ClampOn
488488
| FixedOnly
489489
| ClampOff
490+
deriving ( Eq, Ord, Show )
490491

491492
marshalClampMode :: ClampMode -> GLenum
492493
marshalClampMode x = case x of
@@ -505,5 +506,5 @@ unmarshalClampMode x
505506

506507
clampColor :: ClampTarget -> StateVar ClampMode
507508
clampColor ct = makeStateVar (getClampColor ct) (setClampColor ct)
508-
where setClampColor t = glClampColor (marshalClampTarget t) . marshalClampMode
509-
getClampColor = getEnum1 unmarshalClampMode . marshalClampTargetToPName
509+
where getClampColor = getEnum1 unmarshalClampMode . marshalClampTargetToPName
510+
setClampColor t = glClampColor (marshalClampTarget t) . marshalClampMode

Graphics/Rendering/OpenGL/GL/FramebufferObjects/RenderbufferObject.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import Graphics.Rendering.OpenGL.Raw
2525
--------------------------------------------------------------------------------
2626

2727
data RenderbufferObject = RenderbufferObject { renderbufferID :: GLuint}
28+
deriving ( Eq, Ord, Show )
2829

2930
instance ObjectName RenderbufferObject where
3031
isObjectName = fmap unmarshalGLboolean . glIsRenderbuffer . renderbufferID

Graphics/Rendering/OpenGL/GL/FramebufferObjects/RenderbufferObjects.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{-# OPTIONS_HADDOCK hide #-}
22
-----------------------------------------------------------------------------
33
-- |
4-
-- Module : Graphics.Rendering.OpenGL.GL.FramebufferObjects.RendebufferObjects
4+
-- Module : Graphics.Rendering.OpenGL.GL.FramebufferObjects.RenderbufferObjects
55
-- Copyright : (c) Sven Panne, Lars Corbijn 2011-2013
66
-- License : BSD3
77
--

Graphics/Rendering/OpenGL/GL/PixelRectangles/PixelMap.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ data PixelMapTarget =
4343
| GToG
4444
| BToB
4545
| AToA
46+
deriving ( Eq, Ord, Show )
4647

4748
marshalPixelMapTarget :: PixelMapTarget -> GLenum
4849
marshalPixelMapTarget x = case x of

0 commit comments

Comments
 (0)