diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ -### 2.1.6 +### 2.1.8 +- Update dependencies to make it build with stack resolver nightly-2016-09-24 + +### 2.1.7 + - Runtime optimizations (Use BaseVertex for glDraw* instead of offsetting each attribute) ### 2.1.6 @@ -41,7 +45,7 @@ ### 2.0.2 - Linear bumped to 1.20 -- Running contextSwap and contextFrameBufferSize on righjt thread (#7) +- Running contextSwap and contextFrameBufferSize on right thread (#7) - render now throws if rendering to an image from a texture thats used for sampling (#8) - Added GPipe class instances for all linear types (#9) diff --git a/GPipe.cabal b/GPipe.cabal --- a/GPipe.cabal +++ b/GPipe.cabal @@ -1,62 +1,62 @@ -name: GPipe -version: 2.1.7 -cabal-version: >= 1.8 -build-type: Simple -author: Tobias Bexelius -license: MIT -license-file: LICENSE -copyright: Tobias Bexelius -category: Graphics -stability: Experimental -synopsis: Typesafe functional GPU graphics programming -homepage: http://tobbebex.blogspot.se/ -bug-reports: https://github.com/tobbebex/GPipe-Core/issues -description: - A typesafe API based on the conceptual model of OpenGl, but without the imperative state machine. - Aims to be as close to the raw OpenGl performance as possible, without compromising type safety or functional style. - Includes DSL for shaders to provide type safety even when crossing into that domain. - Uses OpenGl 3.3 core profile under the hood. -maintainer: Tobias Bexelius -data-files: CHANGELOG.md - -library - hs-source-dirs: src - build-depends: base >= 4.7 && < 4.9, - transformers >= 0.3 && < 0.5, - exception-transformers >= 0.3 && < 0.5, - containers >= 0.5 && < 0.6, - Boolean >= 0.2 && <0.3, - hashtables >= 1.2 && < 1.3, - gl >= 0.7 && < 0.8, - linear >= 1.18 && < 1.21 - exposed-modules: - Graphics.GPipe, - Graphics.GPipe.Buffer, - Graphics.GPipe.Context, - Graphics.GPipe.Expr, - Graphics.GPipe.Format, - Graphics.GPipe.FragmentStream, - Graphics.GPipe.FrameBuffer, - Graphics.GPipe.PrimitiveArray, - Graphics.GPipe.PrimitiveStream, - Graphics.GPipe.Sampler, - Graphics.GPipe.Shader, - Graphics.GPipe.Texture, - Graphics.GPipe.Uniform, - Graphics.GPipe.Orphans - other-modules: - Data.SNMap, - Graphics.GPipe.Internal.Buffer, - Graphics.GPipe.Internal.Compiler, - Graphics.GPipe.Internal.Context, - Graphics.GPipe.Internal.Expr, - Graphics.GPipe.Internal.Format, - Graphics.GPipe.Internal.FragmentStream, - Graphics.GPipe.Internal.FrameBuffer, - Graphics.GPipe.Internal.PrimitiveArray, - Graphics.GPipe.Internal.PrimitiveStream, - Graphics.GPipe.Internal.Shader, - Graphics.GPipe.Internal.Texture, - Graphics.GPipe.Internal.Uniform, - Graphics.GPipe.Internal.Orphans - +name: GPipe +version: 2.1.8 +cabal-version: >= 1.8 +build-type: Simple +author: Tobias Bexelius +license: MIT +license-file: LICENSE +copyright: Tobias Bexelius +category: Graphics +stability: Experimental +synopsis: Typesafe functional GPU graphics programming +homepage: https://github.com/tobbebex/GPipe-Core#readme +bug-reports: https://github.com/tobbebex/GPipe-Core/issues +description: + A typesafe API based on the conceptual model of OpenGl, but without the imperative state machine. + Aims to be as close to the raw OpenGl performance as possible, without compromising type safety or functional style. + Includes DSL for shaders to provide type safety even when crossing into that domain. + Uses OpenGl 3.3 core profile under the hood. +maintainer: Tobias Bexelius +data-files: CHANGELOG.md + +library + hs-source-dirs: src + build-depends: base >= 4.9 && < 4.10, + transformers >= 0.5.2 && < 0.6, + exception-transformers >= 0.3 && < 0.5, + containers >= 0.5 && < 0.6, + Boolean >= 0.2 && <0.3, + hashtables >= 1.2 && < 1.3, + gl >= 0.7 && < 0.8, + linear >= 1.18 && < 1.21 + exposed-modules: + Graphics.GPipe, + Graphics.GPipe.Buffer, + Graphics.GPipe.Context, + Graphics.GPipe.Expr, + Graphics.GPipe.Format, + Graphics.GPipe.FragmentStream, + Graphics.GPipe.FrameBuffer, + Graphics.GPipe.PrimitiveArray, + Graphics.GPipe.PrimitiveStream, + Graphics.GPipe.Sampler, + Graphics.GPipe.Shader, + Graphics.GPipe.Texture, + Graphics.GPipe.Uniform, + Graphics.GPipe.Orphans + other-modules: + Data.SNMap, + Graphics.GPipe.Internal.Buffer, + Graphics.GPipe.Internal.Compiler, + Graphics.GPipe.Internal.Context, + Graphics.GPipe.Internal.Expr, + Graphics.GPipe.Internal.Format, + Graphics.GPipe.Internal.FragmentStream, + Graphics.GPipe.Internal.FrameBuffer, + Graphics.GPipe.Internal.PrimitiveArray, + Graphics.GPipe.Internal.PrimitiveStream, + Graphics.GPipe.Internal.Shader, + Graphics.GPipe.Internal.Texture, + Graphics.GPipe.Internal.Uniform, + Graphics.GPipe.Internal.Orphans + diff --git a/src/Graphics/GPipe.hs b/src/Graphics/GPipe.hs --- a/src/Graphics/GPipe.hs +++ b/src/Graphics/GPipe.hs @@ -9,12 +9,22 @@ -- Portability : Portable -- -- | --- A typesafe API based on the conceptual model of OpenGl, but without the imperative state machine. --- Aims to be as close to the raw OpenGl performance as possible, without compromising type safety or functional style. --- Includes DSL for shaders to provide type safety even when crossing into that domain. --- Uses OpenGl 3.3 core profile under the hood. +-- A typesafe API based on the conceptual model of OpenGl, but without the imperative state machine. +-- GPipe aims to be as close to raw OpenGl performance as possible, without compromising type safety or functional style. +-- Includes an embedded domain specific language for GLSL shaders which provides type safety even when crossing into that domain. +-- Uses the OpenGl 3.3 core profile under the hood. -- --- This is a convenience module, reexporting GPipes all other modules, plus the external Linear and Data.Boolean modules. +-- To learn GPipe, start with the +-- at the . +-- You could also go directly to +-- or the tutorials: +-- , +-- , +-- , +-- , +-- . +-- +-- This module reexports relevant GPipe modules and the external "Linear" and "Data.Boolean" modules. ----------------------------------------------------------------------------- module Graphics.GPipe (