Skip to content

Commit 068710c

Browse files
committed
Really hide ByteString and only export (un)packUtf8. Removed -O2. Bumped version to 2.11.0.0.
1 parent 862a86e commit 068710c

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

OpenGL.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: OpenGL
2-
version: 2.10.0.2
2+
version: 2.11.0.0
33
synopsis: A binding for the OpenGL graphics system
44
description:
5-
A Haskell binding for the OpenGL graphics system (GL, version 4.4) and its
5+
A Haskell binding for the OpenGL graphics system (GL, version 4.5) and its
66
accompanying utility library (GLU, version 1.3).
77
.
88
OpenGL is the industry's most widely used and supported 2D and 3D graphics
@@ -31,7 +31,6 @@ library
3131
Graphics.Rendering.OpenGL.GL.BeginEnd
3232
Graphics.Rendering.OpenGL.GL.Bitmaps
3333
Graphics.Rendering.OpenGL.GL.BufferObjects
34-
Graphics.Rendering.OpenGL.GL.ByteString
3534
Graphics.Rendering.OpenGL.GL.Clipping
3635
Graphics.Rendering.OpenGL.GL.ColorSum
3736
Graphics.Rendering.OpenGL.GL.Colors
@@ -105,6 +104,7 @@ library
105104
other-modules:
106105
Graphics.Rendering.OpenGL.GL.BlendingFactor
107106
Graphics.Rendering.OpenGL.GL.BufferMode
107+
Graphics.Rendering.OpenGL.GL.ByteString
108108
Graphics.Rendering.OpenGL.GL.Capability
109109
Graphics.Rendering.OpenGL.GL.ComparisonFunction
110110
Graphics.Rendering.OpenGL.GL.ControlPoint
@@ -145,7 +145,7 @@ library
145145
Graphics.Rendering.OpenGL.GL.VertexAttributes
146146
Graphics.Rendering.OpenGL.GLU.ErrorsInternal
147147
hs-source-dirs: src
148-
ghc-options: -Wall -O2
148+
ghc-options: -Wall
149149
build-depends:
150150
base >= 3 && < 5, bytestring, text, OpenGLRaw >= 2.1, GLURaw >= 1.3.0.0
151151
default-language: Haskell2010

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ module Graphics.Rendering.OpenGL.GL.Shaders.ShaderObjects (
2121

2222
-- * Shader Queries
2323
shaderType, shaderDeleteStatus, compileStatus, shaderInfoLog,
24-
PrecisionType, shaderPrecisionFormat
24+
PrecisionType, shaderPrecisionFormat,
25+
26+
-- * Bytestring utilities
27+
packUtf8, unpackUtf8
2528
) where
2629

2730
import Control.Monad
@@ -98,7 +101,7 @@ setShaderSource shader src =
98101
with srcLength $ \srcLengthBuf ->
99102
glShaderSource (shaderID shader) 1 srcPtrBuf srcLengthBuf
100103

101-
{-# DEPRECATED shaderSource "Use 'shaderSourceBS' instead." #-}
104+
{-# DEPRECATED shaderSource "Use a combination of 'shaderSourceBS' and 'packUtf8' or 'unpackUtf8' instead." #-}
102105
shaderSource :: Shader -> StateVar [String]
103106
shaderSource shader =
104107
makeStateVar

0 commit comments

Comments
 (0)