1 files changed, 21 insertions, 21 deletions

diff --git a/Spear/GL.hs b/Spear/GL.hs
index f463109..3c1734b 100644
--- a/Spear/GL.hs
+++ b/Spear/GL.hs
@@ -36,7 +36,7 @@ module Spear.GL
     Data.StateVar.get,

 

     -- * VAOs

-    VAO,

+    VAO(..),

     newVAO,

     bindVAO,

     unbindVAO,

@@ -48,7 +48,7 @@ module Spear.GL
     drawElements,

 

     -- * Buffers

-    GLBuffer,

+    GLBuffer(..),

     TargetBuffer (..),

     BufferUsage (..),

     newBuffer,

@@ -122,7 +122,7 @@ import           Unsafe.Coerce
 -- | A GLSL shader handle.

 data GLSLShader = GLSLShader

   { getShader    :: GLuint,

-    getShaderKey :: Resource

+    getShaderKey :: ReleaseKey

   }

 

 instance ResourceClass GLSLShader where

@@ -131,7 +131,7 @@ instance ResourceClass GLSLShader where
 -- | A GLSL program handle.

 data GLSLProgram = GLSLProgram

   { getProgram    :: GLuint,

-    getProgramKey :: Resource

+    getProgramKey :: ReleaseKey

   }

 

 instance ResourceClass GLSLProgram where

@@ -173,11 +173,11 @@ attribLocation prog var = makeStateVar get set
 -- | Create a new program.

 newProgram :: [GLSLShader] -> Game s GLSLProgram

 newProgram shaders = do

-  h <- gameIO glCreateProgram

+  h <- liftIO glCreateProgram

   when (h == 0) $ gameError "glCreateProgram failed"

   rkey <- register $ deleteProgram h

   let program = GLSLProgram h rkey

-  mapM_ (gameIO . attachShader program) shaders

+  mapM_ (liftIO . attachShader program) shaders

   linkProgram program

   return program

 

@@ -192,7 +192,7 @@ deleteProgram prog = do
 linkProgram :: GLSLProgram -> Game s ()

 linkProgram prog = do

   let h = getProgram prog

-  err <- gameIO $ do

+  err <- liftIO $ do

     glLinkProgram h

     alloca $ \statptr -> do

       glGetProgramiv h GL_LINK_STATUS statptr

@@ -235,7 +235,7 @@ loadShader shaderType file = do
 -- | Create a new shader.

 newShader :: ShaderType -> Game s GLSLShader

 newShader shaderType = do

-  h <- gameIO $ glCreateShader (toGLShader shaderType)

+  h <- liftIO $ glCreateShader (toGLShader shaderType)

   case h of

     0 -> gameError "glCreateShader failed"

     _ -> do

@@ -253,10 +253,10 @@ deleteShader shader = do
 -- into the shader.

 loadSource :: FilePath -> GLSLShader -> Game s ()

 loadSource file h = do

-  exists <- gameIO $ doesFileExist file

+  exists <- liftIO $ doesFileExist file

   case exists of

     False -> gameError "the specified shader file does not exist"

-    True -> gameIO $ do

+    True -> liftIO $ do

       code <- readSource file

       withCString code $ shaderSource h

 

@@ -272,10 +272,10 @@ compile file shader = do
   let h = getShader shader

 

   -- Compile

-  gameIO $ glCompileShader h

+  liftIO $ glCompileShader h

 

   -- Verify status

-  err <- gameIO $

+  err <- liftIO $

     alloca $ \statusPtr -> do

       glGetShaderiv h GL_COMPILE_STATUS statusPtr

       result <- peek statusPtr

@@ -438,7 +438,7 @@ instance Uniform [Int] where
 -- | A vertex array object.

 data VAO = VAO

   { getVAO :: GLuint,

-    vaoKey :: Resource

+    vaoKey :: ReleaseKey

   }

 

 instance ResourceClass VAO where

@@ -454,7 +454,7 @@ instance Ord VAO where
 -- | Create a new vao.

 newVAO :: Game s VAO

 newVAO = do

-  h <- gameIO . alloca $ \ptr -> do

+  h <- liftIO . alloca $ \ptr -> do

     glGenVertexArrays 1 ptr

     peek ptr

 

@@ -533,11 +533,11 @@ drawElements mode count t idxs = glDrawElements mode (unsafeCoerce count) t idxs
 -- | An OpenGL buffer.

 data GLBuffer = GLBuffer

   { getBuffer :: GLuint,

-    rkey      :: Resource

+    bufferKey :: ReleaseKey

   }

 

 instance ResourceClass GLBuffer where

-  getResource = rkey

+  getResource = bufferKey

 

 -- | The type of target buffer.

 data TargetBuffer

@@ -580,7 +580,7 @@ fromUsage DynamicCopy = GL_DYNAMIC_COPY
 -- | Create a new buffer.

 newBuffer :: Game s GLBuffer

 newBuffer = do

-  h <- gameIO . alloca $ \ptr -> do

+  h <- liftIO . alloca $ \ptr -> do

     glGenBuffers 1 ptr

     peek ptr

 

@@ -656,7 +656,7 @@ withGLBuffer buf f = f $ getBuffer buf
 -- | Represents a texture resource.

 data Texture = Texture

   { getTex :: GLuint,

-    texKey :: Resource

+    texKey :: ReleaseKey

   }

 

 instance Eq Texture where

@@ -672,7 +672,7 @@ instance ResourceClass Texture where
 -- | Create a new texture.

 newTexture :: Game s Texture

 newTexture = do

-  tex <- gameIO . alloca $ \ptr -> do

+  tex <- liftIO . alloca $ \ptr -> do

     glGenTextures 1 ptr

     peek ptr

 

@@ -697,7 +697,7 @@ loadTextureImage ::
 loadTextureImage file minFilter magFilter = do

   image <- loadImage file

   tex <- newTexture

-  gameIO $ do

+  liftIO $ do

     let w = width image

         h = height image

         pix = pixels image

@@ -794,7 +794,7 @@ printGLError =
 assertGL :: Game s a -> String -> Game s a

 assertGL action err = do

   result <- action

-  status <- gameIO getGLError

+  status <- liftIO getGLError

   case status of

     Just str -> gameError $ "OpenGL error raised: " ++ err ++ "; " ++ str

     Nothing  -> return result