Skip to content

Commit 1facd81

Browse files
committed
Removed redundant constraints. Bumped version to 3.0.0.2.
1 parent 17a5054 commit 1facd81

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
3.0.0.2
2+
-------
3+
* Removed redundant constraints.
4+
15
3.0.0.1
26
-------
37
* Relaxed upper version bound for `OpenGLRaw`.

OpenGL.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: OpenGL
2-
version: 3.0.0.1
2+
version: 3.0.0.2
33
synopsis: A binding for the OpenGL graphics system
44
description:
55
A Haskell binding for the OpenGL graphics system (GL, version 4.5) and its

src/Graphics/Rendering/OpenGL/GL/Evaluators.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ data MapDescriptor d =
7474
MapDescriptor (d, d) Stride Order NumComponents
7575
deriving ( Eq, Ord, Show )
7676

77-
totalComponents1 :: Domain d => MapDescriptor d -> Int
77+
totalComponents1 :: MapDescriptor d -> Int
7878
totalComponents1 (MapDescriptor _ stride order numComp) =
7979
fromIntegral stride * (fromIntegral order - 1) + fromIntegral numComp
8080

src/Graphics/Rendering/OpenGL/GL/QueryUtils/PName.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class GetPName p => GetPName1F p where
113113
getClampd1 = get1 getDoublev
114114

115115
-- | Helper function for the get*1 functions.
116-
get1 :: (Storable b, Storable c, GetPName p)
116+
get1 :: (Storable b, Storable c)
117117
=> (p -> Ptr c -> IO ())
118118
-> (b -> a) -- ^ Conversion from the casted value to the return value
119119
-> p -> IO a
@@ -138,7 +138,7 @@ class GetPName p => GetIPName1I p where
138138
getInteger641i = get1i getInteger64iv
139139

140140
-- Indexed helper
141-
get1i :: (Storable b, Storable c, GetPName p)
141+
get1i :: (Storable b, Storable c)
142142
=> (p -> GLuint -> Ptr c -> IO ())
143143
-> (b -> a) -- ^ Conversion from the casted value to the return value
144144
-> p -> GLuint -> IO a
@@ -175,7 +175,7 @@ class GetPName p => GetPName2F p where
175175
getClampd2 = get2 getDoublev
176176

177177
-- | Helper function for the get*2 functions.
178-
get2 :: (Storable b, Storable c, GetPName p)
178+
get2 :: (Storable b, Storable c)
179179
=> (p -> Ptr c -> IO ())
180180
-> (b -> b -> a) -- ^ Conversion from the casted value to the return value
181181
-> p -> IO a
@@ -212,7 +212,7 @@ class GetPName p => GetPName3F p where
212212
getClampd3 = get3 getDoublev
213213

214214
-- | Helper function for the get*3 functions.
215-
get3 :: (Storable b, Storable c, GetPName p)
215+
get3 :: (Storable b, Storable c)
216216
=> (p -> Ptr c -> IO ())
217217
-> (b -> b -> b -> a) -- ^ Conversion from the casted value to the return value
218218
-> p -> IO a
@@ -249,7 +249,7 @@ class GetPName p => GetPName4F p where
249249
getClampd4 = get4 getDoublev
250250

251251
-- | Helper function for the get*4 functions.
252-
get4 :: (Storable b, Storable c, GetPName p)
252+
get4 :: (Storable b, Storable c)
253253
=> (p -> Ptr c -> IO ())
254254
-> (b -> b -> b -> b -> a) -- ^ Conversion from the casted value to the return value
255255
-> p -> IO a
@@ -271,7 +271,7 @@ class GetPName p => GetIPName4I p where
271271
getSizei4i = get4i getIntegeriv
272272

273273
-- | Helper function for the get*4 functions.
274-
get4i :: (Storable b, Storable c, GetPName p)
274+
get4i :: (Storable b, Storable c)
275275
=> (p -> GLuint -> Ptr c -> IO ())
276276
-> (b -> b -> b -> b -> a) -- ^ Conversion from the casted value to the return value
277277
-> p -> GLuint -> IO a

src/Graphics/Rendering/OpenGL/GL/Shaders/Uniform.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ makeUniformVar setter location = makeStateVar getter (setter location)
157157
getUniform program location buf
158158
peek buf
159159

160-
getSimpleUniform :: Storable a => Program -> UniformLocation -> Ptr a -> IO ()
160+
getSimpleUniform :: Program -> UniformLocation -> Ptr a -> IO ()
161161
getSimpleUniform (Program p) (UniformLocation ul) = glGetUniformfv p ul . castPtr
162162

163163
makeSimpleUniformVar :: (UniformComponent a)

src/Graphics/Rendering/OpenGL/GL/Texturing/Parameters.hs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,17 +212,15 @@ textureCompareOperator =
212212

213213
--------------------------------------------------------------------------------
214214

215-
combineTexParams :: ParameterizedTextureTarget t
216-
=> (t -> StateVar a)
215+
combineTexParams :: (t -> StateVar a)
217216
-> (t -> StateVar b)
218217
-> (t -> StateVar (a,b))
219218
combineTexParams v w t =
220219
makeStateVar
221220
(liftM2 (,) (get (v t)) (get (w t)))
222221
(\(x,y) -> do v t $= x; w t $= y)
223222

224-
combineTexParamsMaybe :: ParameterizedTextureTarget t
225-
=> (t -> StateVar Capability)
223+
combineTexParamsMaybe :: (t -> StateVar Capability)
226224
-> (t -> StateVar a)
227225
-> (t -> StateVar (Maybe a))
228226
combineTexParamsMaybe enab val t =

0 commit comments

Comments
 (0)