Fixes after new shaderSource interface.

Author: svenpanne

examples/Misc/SmoothOpenGL3.hs

@@ -100,7 +100,7 @@ checked action getStatus getInfoLog message object = do
 compileAndCheck :: Shader -> IO ()
 compileAndCheck = checked compileShader compileStatus shaderInfoLog "compile"
 
-compileShaderSource :: ShaderType -> [String] -> IO Shader
+compileShaderSource :: ShaderType -> String -> IO Shader
 compileShaderSource st source = do
    shader <- createShader st
    shaderSource shader $= source
@@ -119,8 +119,8 @@ createProgramUsing shaders = do
 
 initShader :: IO (UniformLocation, AttribLocation, AttribLocation)
 initShader = do
-   vertexShader <- compileShaderSource VertexShader [vertexShaderSource]
-   fragmentShader <- compileShaderSource FragmentShader [fragmentShaderSource]
+   vertexShader <- compileShaderSource VertexShader vertexShaderSource
+   fragmentShader <- compileShaderSource FragmentShader fragmentShaderSource
    program <- createProgramUsing [vertexShader, fragmentShader]
    currentProgram $= Just program
 

examples/OrangeBook/ogl2brick/Brick.hs

@@ -293,7 +293,7 @@ readAndCompileShader :: ShaderType -> FilePath -> IO Shader
 readAndCompileShader st filePath = do
    src <- readFile filePath
    shader <- createShader st
-   shaderSource shader $= [src]
+   shaderSource shader $= src
    compileShader shader
    reportErrors
    ok <- get (compileStatus shader)

examples/RedBook8/common/LoadShaders.hs

@@ -14,7 +14,7 @@
 --------------------------------------------------------------------------------
 
 module LoadShaders (
-   ShaderSource(..), ShaderInfo(..), loadShaders
+   ShaderSource'(..), ShaderInfo(..), loadShaders
 ) where
 
 import Control.Exception
@@ -25,22 +25,22 @@ import Graphics.Rendering.OpenGL
 
 -- | The source of the shader source code.
 
-data ShaderSource =
+data ShaderSource' =
      FileSource FilePath
      -- ^ The shader source code is located in the file at the given 'FilePath'.
    | StringSource String
      -- ^ The shader source code is directly given as a 'String'.
    deriving ( Eq, Ord, Show )
 
-getSource :: ShaderSource -> IO String
+getSource :: ShaderSource' -> IO String
 getSource (FileSource path) = readFile path
 getSource (StringSource src) = return src
 
 --------------------------------------------------------------------------------
 
 -- | 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 )
 
 --------------------------------------------------------------------------------
@@ -63,7 +63,7 @@ loadCompileAttach _ [] = return ()
 loadCompileAttach program (ShaderInfo shType source : infos) =
    createShader shType `bracketOnError` deleteObjectName $ \shader -> do
       src <- getSource source
-      shaderSource shader $= [src]
+      shaderSource shader $= src
       compileAndCheck shader
       attachShader program shader
       loadCompileAttach program infos