GPipe 2.2.4 → 2.2.5

raw patch · 6 files changed

+26/−5 lines, 6 filesdep ~glPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: gl

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• GPipe.cabal +2/−2
• src/Graphics/GPipe/Internal/Context.hs +4/−0
• src/Graphics/GPipe/Internal/FragmentStream.hs +4/−0
• src/Graphics/GPipe/Internal/PrimitiveArray.hs +8/−1
• src/Graphics/GPipe/Internal/PrimitiveStream.hs +4/−2

@@ -1,3 +1,7 @@+### 2.2.5
+
+- Support for GHC 8.8.3
+
 ### 2.2.4
 
 - Support for GHC 8.6.5 (#63)

@@ -1,5 +1,5 @@ name:           GPipe
-version:        2.2.4
+version:        2.2.5
 cabal-version:  >= 1.8
 build-type:     Simple
 author:         Tobias Bexelius
@@ -27,7 +27,7 @@                     containers >= 0.5 && < 0.7,
                     Boolean >= 0.2 && <0.3,
                     hashtables >= 1.2 && < 1.3,
-                    gl >= 0.8 && < 0.9,
+                    gl >= 0.8 && <= 0.9,
                     linear >= 1.18 && < 1.21
   exposed-modules:
                     Graphics.GPipe,

@@ -33,6 +33,7 @@ import Graphics.GPipe.Internal.Format
 import Control.Monad.Exception (MonadException, Exception, MonadAsyncException,bracket)
 import Control.Monad.Trans.Reader
+import qualified Control.Monad.Fail as MF
 import Control.Monad.IO.Class
 import Control.Monad.Trans.Class
 import Control.Applicative (Applicative, (<$>))
@@ -161,6 +162,9 @@ 
 instance MonadTrans (ContextT ctx os) where
     lift = ContextT . lift . lift
+
+instance MonadIO m => MF.MonadFail (ContextT ctx os m) where
+    fail = liftIO . MF.fail
 
 -- | Run a 'ContextT' monad transformer that encapsulates an object space.
 --   You need an implementation of a 'ContextHandler', which is provided by an auxillary package, such as @GPipe-GLFW@.

@@ -1,3 +1,4 @@+{-# LANGUAGE CPP #-}
 {-# LANGUAGE TypeFamilies, ScopedTypeVariables, TypeSynonymInstances, FlexibleInstances, GeneralizedNewtypeDeriving, Arrows, FlexibleContexts  #-}
 module Graphics.GPipe.Internal.FragmentStream where
 
@@ -10,6 +11,9 @@ import Graphics.GPipe.Internal.PrimitiveArray
 import Control.Monad.Trans.State.Lazy
 import Data.Monoid (Monoid)
+#if __GLASGOW_HASKELL__ < 804
+import Data.Semigroup (Semigroup(..))
+#endif
 import Data.Boolean
 import Data.IntMap.Lazy (insert)
 import Linear.V4

@@ -1,9 +1,13 @@+{-# LANGUAGE CPP #-}
 {-# LANGUAGE TypeSynonymInstances, FlexibleInstances, ScopedTypeVariables, EmptyDataDecls, TypeFamilies, GADTs #-}
 module Graphics.GPipe.Internal.PrimitiveArray where
 
 import Graphics.GPipe.Internal.Buffer
 import Graphics.GPipe.Internal.Shader
-import Data.Monoid
+#if __GLASGOW_HASKELL__ < 804
+import Data.Semigroup
+#endif
+import Data.Monoid hiding ((<>))
 import Data.IORef
 
 import Data.Word
@@ -144,6 +148,9 @@ 
 instance Monoid (PrimitiveArray p a) where
     mempty = PrimitiveArray []
+#if __GLASGOW_HASKELL__ < 804
+    mappend = (<>)
+#endif
 
 instance Functor (PrimitiveArray p) where
     fmap f (PrimitiveArray xs) = PrimitiveArray  $ fmap g xs

@@ -1,3 +1,4 @@+{-# LANGUAGE CPP #-}
 {-# LANGUAGE TypeFamilies, TypeSynonymInstances, FlexibleContexts, FlexibleInstances, ScopedTypeVariables, Arrows, GeneralizedNewtypeDeriving, PatternSynonyms #-}
 
 module Graphics.GPipe.Internal.PrimitiveStream where
@@ -17,6 +18,9 @@ import Control.Arrow
 import Control.Monad (void)
 import Data.Monoid (Monoid(..))
+#if __GLASGOW_HASKELL__ < 804
+import Data.Semigroup (Semigroup(..))
+#endif
 import Data.IntMap.Lazy (insert)
 import Data.Word
 import Data.Int
@@ -461,5 +465,3 @@                 e' <- toVertex -< e
                 f' <- toVertex -< f
                 returnA -< Plucker a' b' c' d' e' f'
-
-