Commit before attempting to change cloud shading
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
module Shader.Compile (
|
||||
setupVBO,
|
||||
setupVBO',
|
||||
makeShaderVAOEBO,
|
||||
setupVBOStatic,
|
||||
makeShaderEBO,
|
||||
makeShader,
|
||||
makeShader4,
|
||||
makeByteStringShaderUsingVAO,
|
||||
@@ -47,7 +47,7 @@ makeShader s shaderlist sizes pm = do
|
||||
}
|
||||
, vbo)
|
||||
|
||||
makeShaderVAOEBO ::
|
||||
makeShaderEBO ::
|
||||
-- | First part of the name of the shader
|
||||
String ->
|
||||
-- | shader types
|
||||
@@ -58,14 +58,13 @@ makeShaderVAOEBO ::
|
||||
Int ->
|
||||
GLenum ->
|
||||
VBO ->
|
||||
IO (Shader, VAO, EBO)
|
||||
makeShaderVAOEBO s shaderlist sizes strd pm vbo = do
|
||||
IO (Shader, EBO)
|
||||
makeShaderEBO s shaderlist sizes strd pm vbo = do
|
||||
prog <- makeSourcedShader s shaderlist
|
||||
vao <- setupVAOvbo sizes strd vbo
|
||||
ebo <- setupEBO vao
|
||||
return
|
||||
( Shader prog pm
|
||||
, vao
|
||||
( Shader prog pm vao
|
||||
, ebo
|
||||
)
|
||||
|
||||
@@ -102,8 +101,8 @@ setupVBO vertexsize = do
|
||||
GL_STREAM_DRAW
|
||||
return VBO {_vboName = vboname, _vboPtr = thePtr, _vboVertexSize = vertexsize}
|
||||
|
||||
setupVBO' :: Int -> IO VBO
|
||||
setupVBO' vertexsize = do
|
||||
setupVBOStatic :: Int -> IO VBO
|
||||
setupVBOStatic vertexsize = do
|
||||
vboname <- mglCreate glCreateBuffers
|
||||
thePtr <- mallocArray (vertexsize * numDrawableElements)
|
||||
-- Allocate space
|
||||
|
||||
Reference in New Issue
Block a user