Fixes after shaderSource change.

Author: svenpanne

examples/Misc/SmoothOpenGL3.hs

@@ -6,7 +6,10 @@
 -}
 
 import Control.Monad
+import qualified Data.ByteString as B
 import Data.List
+import qualified Data.Text as T
+import qualified Data.Text.Encoding as TE
 import Foreign.Marshal.Array
 import Foreign.Ptr
 import Foreign.Storable
@@ -67,8 +70,11 @@ initBuffer = do
    checkError "initBuffer"
    return bufferObject
 
-vertexShaderSource :: String
-vertexShaderSource = unlines [
+packUtf8 :: String -> B.ByteString
+packUtf8 = TE.encodeUtf8 . T.pack
+
+vertexShaderSource :: B.ByteString
+vertexShaderSource = packUtf8 . unlines $ [
    "#version 140",
    "uniform mat4 fg_ProjectionMatrix;",
    "in vec4 fg_Color;",
@@ -80,8 +86,8 @@ vertexShaderSource = unlines [
    "   gl_Position = fg_ProjectionMatrix * fg_Vertex;",
    "}" ]
 
-fragmentShaderSource :: String
-fragmentShaderSource = unlines [
+fragmentShaderSource :: B.ByteString
+fragmentShaderSource = packUtf8 . unlines $ [
    "#version 140",
    "smooth in vec4 fg_SmoothColor;",
    "out vec4 fg_FragColor;",
@@ -100,7 +106,7 @@ checked action getStatus getInfoLog message object = do
 compileAndCheck :: Shader -> IO ()
 compileAndCheck = checked compileShader compileStatus shaderInfoLog "compile"
 
-compileShaderSource :: ShaderType -> String -> IO Shader
+compileShaderSource :: ShaderType -> B.ByteString -> IO Shader
 compileShaderSource st source = do
    shader <- createShader st
    shaderSource shader $= source

examples/OrangeBook/ogl2brick/Brick.hs

@@ -9,6 +9,7 @@ import Prelude hiding ( sum )
 import Control.Applicative
 import Control.Exception ( IOException, catch )
 import Control.Monad
+import qualified Data.ByteString as B
 import Data.Foldable ( Foldable, sum )
 import Data.IORef
 import System.Exit
@@ -291,7 +292,7 @@ checkGLSLSupport = do
 
 readAndCompileShader :: ShaderType -> FilePath -> IO Shader
 readAndCompileShader st filePath = do
-   src <- readFile filePath
+   src <- B.readFile filePath
    shader <- createShader st
    shaderSource shader $= src
    compileShader shader

examples/RedBook8/common/LoadShaders.hs

@@ -14,33 +14,42 @@
 --------------------------------------------------------------------------------
 
 module LoadShaders (
-   ShaderSource'(..), ShaderInfo(..), loadShaders
+   ShaderSource(..), ShaderInfo(..), loadShaders
 ) where
 
 import Control.Exception
 import Control.Monad
+import qualified Data.ByteString as B
+import qualified Data.Text as T
+import qualified Data.Text.Encoding as TE
 import Graphics.Rendering.OpenGL
 
 --------------------------------------------------------------------------------
 
 -- | The source of the shader source code.
 
-data ShaderSource' =
-     FileSource FilePath
-     -- ^ The shader source code is located in the file at the given 'FilePath'.
+data ShaderSource =
+     ByteStringSource B.ByteString
+     -- ^ The shader source code is directly given as a 'B.ByteString'.
    | StringSource String
      -- ^ The shader source code is directly given as a 'String'.
+   | FileSource FilePath
+     -- ^ The shader source code is located in the file at the given 'FilePath'.
    deriving ( Eq, Ord, Show )
 
-getSource :: ShaderSource' -> IO String
-getSource (FileSource path) = readFile path
-getSource (StringSource src) = return src
+getSource :: ShaderSource -> IO B.ByteString
+getSource (ByteStringSource bs) = return bs
+getSource (StringSource str) = return $ packUtf8 str
+getSource (FileSource path) = B.readFile path
+
+packUtf8 :: String -> B.ByteString
+packUtf8 = TE.encodeUtf8 . T.pack
 
 --------------------------------------------------------------------------------
 
 -- | A description of a shader: The type of the shader plus its source code.
 
-data ShaderInfo = ShaderInfo ShaderType ShaderSource'
+data ShaderInfo = ShaderInfo ShaderType ShaderSource
    deriving ( Eq, Ord, Show )
 
 --------------------------------------------------------------------------------