OpenGL 2.4.0.1 → 2.4.0.2

raw patch · 17 files changed

+40/−48 lines, 17 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

Graphics/Rendering/OpenGL/GL/BufferObjects.hs +1/−2
Graphics/Rendering/OpenGL/GL/ControlPoint.hs +3/−2
Graphics/Rendering/OpenGL/GL/CoordTrans.hs +1/−2
Graphics/Rendering/OpenGL/GL/DisplayLists.hs +2/−3
Graphics/Rendering/OpenGL/GL/Evaluators.hs +2/−3
Graphics/Rendering/OpenGL/GL/Feedback.hs +1/−2
Graphics/Rendering/OpenGL/GL/PixelRectangles/ColorTable.hs +3/−4
Graphics/Rendering/OpenGL/GL/PixelRectangles/Convolution.hs +1/−2
Graphics/Rendering/OpenGL/GL/PixelRectangles/Histogram.hs +1/−3
Graphics/Rendering/OpenGL/GL/PixelRectangles/Minmax.hs +1/−2
Graphics/Rendering/OpenGL/GL/ReadCopyPixels.hs +1/−3
Graphics/Rendering/OpenGL/GL/RenderMode.hs +2/−2
Graphics/Rendering/OpenGL/GL/Texturing/Environments.hs +1/−2
Graphics/Rendering/OpenGL/GL/Texturing/Parameters.hs +1/−2
Graphics/Rendering/OpenGL/GLU/Mipmapping.hs +4/−4
Graphics/Rendering/OpenGL/GLU/NURBS.hs +1/−2
OpenGL.cabal +14/−8

Graphics/Rendering/OpenGL/GL/BufferObjects.hs view

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GL.BufferObjects -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -44,7 +44,6 @@ import Graphics.Rendering.OpenGL.GL.PeekPoke import Graphics.Rendering.OpenGL.GL.QueryUtils import Graphics.Rendering.OpenGL.GL.VertexArrays-import Graphics.Rendering.OpenGL.GL.VertexSpec import Graphics.Rendering.OpenGL.GLU.ErrorsInternal import Graphics.Rendering.OpenGL.Raw.Core31

Graphics/Rendering/OpenGL/GL/ControlPoint.hs view

@@ -30,7 +30,8 @@    gl_MAP1_TEXTURE_COORD_2, gl_MAP1_TEXTURE_COORD_3, gl_MAP1_TEXTURE_COORD_4,    gl_MAP1_VERTEX_3, gl_MAP2_COLOR_4, gl_MAP2_INDEX, gl_MAP2_NORMAL,    gl_MAP2_TEXTURE_COORD_1, gl_MAP2_TEXTURE_COORD_2, gl_MAP2_TEXTURE_COORD_3,-   gl_MAP2_TEXTURE_COORD_4, gl_MAP2_VERTEX_3, gl_MAP2_VERTEX_4 )+   gl_MAP2_TEXTURE_COORD_4, gl_MAP2_VERTEX_3, gl_MAP2_VERTEX_4,+   gl_MAP1_VERTEX_4 )  -------------------------------------------------------------------------------- @@ -156,7 +157,7 @@    Map1TextureCoord3 -> gl_MAP1_TEXTURE_COORD_3    Map1TextureCoord4 -> gl_MAP1_TEXTURE_COORD_4    Map1Vertex3 -> gl_MAP1_VERTEX_3-   Map1Vertex4 -> gl_MAP1_VERTEX_3+   Map1Vertex4 -> gl_MAP1_VERTEX_4    Map2Color4 -> gl_MAP2_COLOR_4    Map2Index -> gl_MAP2_INDEX    Map2Normal -> gl_MAP2_NORMAL

Graphics/Rendering/OpenGL/GL/CoordTrans.hs view

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GL.CoordTrans -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -47,7 +47,6 @@ import Graphics.Rendering.OpenGL.GL.PeekPoke import Graphics.Rendering.OpenGL.GL.QueryUtils import Graphics.Rendering.OpenGL.GL.Texturing.TextureUnit-import Graphics.Rendering.OpenGL.GL.VertexSpec import Graphics.Rendering.OpenGL.GLU.ErrorsInternal import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (    glFrustum, glGetTexGendv, glGetTexGeniv, glLoadIdentity, glLoadMatrixd,

Graphics/Rendering/OpenGL/GL/DisplayLists.hs view

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GL.DisplayLists -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -32,7 +32,6 @@ import Graphics.Rendering.OpenGL.GL.Exception import Graphics.Rendering.OpenGL.GL.GLboolean import Graphics.Rendering.OpenGL.GL.QueryUtils-import Graphics.Rendering.OpenGL.GL.VertexArrays import Graphics.Rendering.OpenGL.GLU.ErrorsInternal import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (  glCallList, glCallLists, glDeleteLists, glEndList, glGenLists, glIsList,@@ -122,7 +121,7 @@       then do recordOutOfMemory               return noDisplayList       else do let lst = head lists-              defineList lst mode action+              _ <- defineList lst mode action               return lst  --------------------------------------------------------------------------------

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

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GL.Evaluators -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -56,7 +56,6 @@ import Graphics.Rendering.OpenGL.GL.Domain import Graphics.Rendering.OpenGL.GL.PeekPoke import Graphics.Rendering.OpenGL.GL.PolygonMode-import Graphics.Rendering.OpenGL.GL.Polygons import Graphics.Rendering.OpenGL.GL.QueryUtils import Graphics.Rendering.OpenGL.GL.VertexArrays import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (@@ -181,7 +180,7 @@       withForeignPtr fp $ act descriptor  --------------------------------------------------------------------------------- + map1 :: (Map1 m, ControlPoint c, Domain d) => StateVar (Maybe (m c d)) map1 = makeMap1StateVar enableCap1 getMap1 setMap1

Graphics/Rendering/OpenGL/GL/Feedback.hs view

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GL.Feedback -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -25,7 +25,6 @@ import Foreign.Storable import Graphics.Rendering.OpenGL.GL.IOState import Graphics.Rendering.OpenGL.GL.RenderMode-import Graphics.Rendering.OpenGL.GL.Selection import Graphics.Rendering.OpenGL.GL.VertexSpec import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility (    glFeedbackBuffer, glPassThrough, gl_2D, gl_3D, gl_3D_COLOR,

Graphics/Rendering/OpenGL/GL/PixelRectangles/ColorTable.hs view

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GL.PixelRectangles.ColorTable -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -30,7 +30,6 @@ import Graphics.Rendering.OpenGL.GL.CoordTrans import Graphics.Rendering.OpenGL.GL.PeekPoke import Graphics.Rendering.OpenGL.GL.PixelData-import Graphics.Rendering.OpenGL.GL.PixelRectangles.Rasterization import Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat import Graphics.Rendering.OpenGL.GL.VertexSpec import Graphics.Rendering.OpenGL.GLU.ErrorsInternal@@ -203,7 +202,7 @@    where ct = colorTableStageToColorTable s  getColorTableParameterC4f ::-   ColorTable -> ColorTablePName -> IO (Color4 GLfloat) +   ColorTable -> ColorTablePName -> IO (Color4 GLfloat) getColorTableParameterC4f ct p =    alloca $ \buf -> do       glGetColorTableParameterfv@@ -215,7 +214,7 @@ colorTableParameterC4f ::    ColorTable -> ColorTablePName -> Color4 GLfloat -> IO () colorTableParameterC4f ct p c =-   with c $ \ptr -> +   with c $ \ptr ->       glColorTableParameterfv (marshalColorTable ct) (marshalColorTablePName p) (castPtr ptr)  --------------------------------------------------------------------------------

Graphics/Rendering/OpenGL/GL/PixelRectangles/Convolution.hs view

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GL.PixelRectangles.Convolution -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -34,7 +34,6 @@ import Graphics.Rendering.OpenGL.GL.CoordTrans import Graphics.Rendering.OpenGL.GL.PeekPoke import Graphics.Rendering.OpenGL.GL.PixelData-import Graphics.Rendering.OpenGL.GL.PixelRectangles.Rasterization import Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat import Graphics.Rendering.OpenGL.GL.VertexSpec import Graphics.Rendering.OpenGL.GLU.ErrorsInternal

Graphics/Rendering/OpenGL/GL/PixelRectangles/Histogram.hs view

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GL.PixelRectangles.Histogram -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -24,8 +24,6 @@ import Graphics.Rendering.OpenGL.GL.PeekPoke import Graphics.Rendering.OpenGL.GL.PixelData import Graphics.Rendering.OpenGL.GL.PixelRectangles.ColorTable-import Graphics.Rendering.OpenGL.GL.PixelRectangles.ColorTable-import Graphics.Rendering.OpenGL.GL.PixelRectangles.Rasterization import Graphics.Rendering.OpenGL.GL.PixelRectangles.Reset import Graphics.Rendering.OpenGL.GL.PixelRectangles.Sink import Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat

Graphics/Rendering/OpenGL/GL/PixelRectangles/Minmax.hs view

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GL.PixelRectangles.Minmax -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -22,7 +22,6 @@ import Graphics.Rendering.OpenGL.GL.Capability import Graphics.Rendering.OpenGL.GL.PeekPoke import Graphics.Rendering.OpenGL.GL.PixelData-import Graphics.Rendering.OpenGL.GL.PixelRectangles.Rasterization import Graphics.Rendering.OpenGL.GL.PixelRectangles.Reset import Graphics.Rendering.OpenGL.GL.PixelRectangles.Sink import Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat

Graphics/Rendering/OpenGL/GL/ReadCopyPixels.hs view

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GL.ReadCopyPixels -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -24,9 +24,7 @@ import Data.StateVar import Graphics.Rendering.OpenGL.GL.BufferMode import Graphics.Rendering.OpenGL.GL.CoordTrans-import Graphics.Rendering.OpenGL.GL.Framebuffer import Graphics.Rendering.OpenGL.GL.PixelData-import Graphics.Rendering.OpenGL.GL.PixelRectangles import Graphics.Rendering.OpenGL.GL.QueryUtils import Graphics.Rendering.OpenGL.GLU.ErrorsInternal import Graphics.Rendering.OpenGL.Raw.ARB.Compatibility ( glCopyPixels )

Graphics/Rendering/OpenGL/GL/RenderMode.hs view

@@ -4,7 +4,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GL.RenderMode -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -50,7 +50,7 @@ withRenderMode :: RenderMode -> IO a -> IO (a, GLint) withRenderMode newMode action = do    oldMode <- get renderMode-   setRenderMode newMode+   _ <- setRenderMode newMode    action `finallyRet` setRenderMode oldMode  setRenderMode :: RenderMode -> IO GLint

Graphics/Rendering/OpenGL/GL/Texturing/Environments.hs view

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GL.Texturing.Environments -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -29,7 +29,6 @@ import Foreign.Storable import Graphics.Rendering.OpenGL.GL.BlendingFactor import Graphics.Rendering.OpenGL.GL.PeekPoke-import Graphics.Rendering.OpenGL.GL.PerFragment import Graphics.Rendering.OpenGL.GL.Texturing.Parameters import Graphics.Rendering.OpenGL.GL.Texturing.TextureUnit import Graphics.Rendering.OpenGL.GL.VertexSpec

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

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GL.Texturing.Parameters -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -27,7 +27,6 @@ import Graphics.Rendering.OpenGL.GL.Capability import Graphics.Rendering.OpenGL.GL.ComparisonFunction import Graphics.Rendering.OpenGL.GL.CoordTrans-import Graphics.Rendering.OpenGL.GL.PerFragment import Graphics.Rendering.OpenGL.GL.QueryUtils import Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat import Graphics.Rendering.OpenGL.GL.Texturing.Specification

Graphics/Rendering/OpenGL/GLU/Mipmapping.hs view

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GLU.Mipmapping -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -34,7 +34,7 @@    withPixelData pdIn $ \fIn dIn pIn ->       withPixelData pdOut $ \fOut dOut pOut ->          if fIn == fOut-            then do gluScaleImage+            then do _ <- gluScaleImage                       fIn widthIn heightIn dIn pIn widthOut heightOut dOut pOut                     return ()   -- TODO: Should we use the return value?             else recordInvalidValue@@ -46,7 +46,7 @@ build1DMipmaps ::    TextureTarget -> PixelInternalFormat -> GLsizei -> PixelData a -> IO () build1DMipmaps target internalFormat height pd = do-   withPixelData pd $+   _ <- withPixelData pd $       gluBuild1DMipmaps          (marshalTextureTarget target)          (marshalPixelInternalFormat internalFormat)@@ -58,7 +58,7 @@ build2DMipmaps :: TextureTarget -> PixelInternalFormat -> GLsizei -> GLsizei                -> PixelData a -> IO () build2DMipmaps target internalFormat width height pd = do-   withPixelData pd $+   _ <- withPixelData pd $       gluBuild2DMipmaps          (marshalTextureTarget target)          (marshalPixelInternalFormat internalFormat)

Graphics/Rendering/OpenGL/GLU/NURBS.hs view

@@ -3,7 +3,7 @@ -- Module      :  Graphics.Rendering.OpenGL.GLU.NURBS -- Copyright   :  (c) Sven Panne 2002-2009 -- License     :  BSD-style (see the file libraries/OpenGL/LICENSE)--- +-- -- Maintainer  :  sven.panne@aedion.de -- Stability   :  stable -- Portability :  portable@@ -45,7 +45,6 @@ import Graphics.Rendering.OpenGL.GL.Exception import Graphics.Rendering.OpenGL.GL.GLboolean import Graphics.Rendering.OpenGL.GL.PrimitiveMode-import Graphics.Rendering.OpenGL.GL.BeginEnd import Graphics.Rendering.OpenGL.GL.VertexSpec import Graphics.Rendering.OpenGL.GLU.ErrorsInternal

OpenGL.cabal view

@@ -1,10 +1,10 @@ name: OpenGL-version: 2.4.0.1+version: 2.4.0.2 license: BSD3 license-file: LICENSE-maintainer: Sven Panne <sven.panne@aedion.de>-bug-reports: mailto:hopengl@haskell.org-homepage: http://www.haskell.org/HOpenGL/+maintainer: Jason Dagit <dagitj@gmail.com>, Sven Panne <sven.panne@aedion.de>+bug-reports: https://github.com/haskell-opengl/OpenGL/issues+homepage: http://www.haskell.org/haskellwiki/Opengl category: Graphics synopsis: A binding for the OpenGL graphics system description:@@ -18,7 +18,9 @@    please see <http://www.opengl.org/>    and <http://www.opengl.org/registry/>. build-type: Simple-exposed-modules:+cabal-version: >= 1.6+library+  exposed-modules:    Graphics.Rendering.OpenGL.GL.Antialiasing,    Graphics.Rendering.OpenGL.GL.BeginEnd,    Graphics.Rendering.OpenGL.GL.Bitmaps,@@ -73,7 +75,7 @@    Graphics.Rendering.OpenGL.GL.VertexArrays,    Graphics.Rendering.OpenGL.GL.VertexSpec,    Graphics.Rendering.OpenGL-other-modules:+  other-modules:    Graphics.Rendering.OpenGL.GL.BlendingFactor,    Graphics.Rendering.OpenGL.GL.BufferMode,    Graphics.Rendering.OpenGL.GL.Capability,@@ -102,6 +104,10 @@    Graphics.Rendering.OpenGL.GL.Texturing.TextureUnit,    Graphics.Rendering.OpenGL.GL.VertexAttributes,    Graphics.Rendering.OpenGL.GLU.ErrorsInternal-ghc-options: -Wall-build-depends:+  ghc-options: -Wall+  build-depends:    base >= 3 && < 5, OpenGLRaw >= 1.1.0.0, GLURaw >= 1.1.0.0, StateVar, ObjectName, Tensor++source-repository head+  type:     git+  location: https://github.com/haskell-opengl/OpenGL