justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Translate VAOs to DSA

Browse Source
This commit is contained in:
justin
2023-03-09 10:10:57 +00:00
parent 18fa216dff
commit 7b797dfdb4
9 changed files with 61 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Render.hs
+4 -2
View File
@@ -110,7 +110,8 @@ doDrawing win pdata u = do
-- uniform (_shadUnis lwShad V.! 0) $= viewFrom3d -- uniform (_shadUnis lwShad V.! 0) $= viewFrom3d
glUseProgram (lwShad ^. shadProg') glUseProgram (lwShad ^. shadProg')
glUniform3f (_shadUnis' lwShad V.! 0) vfx vfy 20 glUniform3f (_shadUnis' lwShad V.! 0) vfx vfy 20
bindVertexArrayObject $= lwShad ^? shadVAO' . vaoName -- Just (_vao $ _shadVAO lwShad) --bindVertexArrayObject $= lwShad ^? shadVAO' . vaoName -- Just (_vao $ _shadVAO lwShad)
glBindVertexArray $ lwShad ^. shadVAO' . vaoName -- Just (_vao $ _shadVAO lwShad)
unless (debugOn Remove_LOS cfig) $ unless (debugOn Remove_LOS cfig) $
glDrawArrays glDrawArrays
(marshalEPrimitiveMode $ _shadPrim' lwShad) (marshalEPrimitiveMode $ _shadPrim' lwShad)
@@ -126,7 +127,8 @@ doDrawing win pdata u = do
let fs = _shapeShader pdata let fs = _shapeShader pdata
--currentProgram $= Just (_shadProg fs) --currentProgram $= Just (_shadProg fs)
glUseProgram (_shadProg' fs) glUseProgram (_shadProg' fs)
bindVertexArrayObject $= fs ^? shadVAO' . vaoName -- Just (_vao $ _shadVAO fs) --bindVertexArrayObject $= fs ^? shadVAO' . vaoName -- Just (_vao $ _shadVAO fs)
glBindVertexArray $ fs ^. shadVAO' . vaoName -- Just (_vao $ _shadVAO fs)
glDrawElements glDrawElements
(marshalEPrimitiveMode $ _shadPrim' fs) (marshalEPrimitiveMode $ _shadPrim' fs)
(fromIntegral nIndices) (fromIntegral nIndices)
src/Dodge/Render/Shadow.hs
+2 -1
View File
@@ -32,7 +32,8 @@ drawCPUShadows pdata s pos rad = do
(theshad ^. shadVAO' . vaoVBO . vboPtr) (theshad ^. shadVAO' . vaoVBO . vboPtr)
--currentProgram $= theshad ^? shadProg --currentProgram $= theshad ^? shadProg
glUseProgram (theshad ^. shadProg') glUseProgram (theshad ^. shadProg')
bindVertexArrayObject $= Just (_vaoName $ _shadVAO' theshad) --bindVertexArrayObject $= Just (_vaoName $ _shadVAO' theshad)
glBindVertexArray $ (_vaoName $ _shadVAO' theshad)
glDrawArrays glDrawArrays
(marshalEPrimitiveMode $ _shadPrim' theshad) (marshalEPrimitiveMode $ _shadPrim' theshad)
0 0
src/GLHelp.hs
+2 -2
View File
@@ -5,8 +5,8 @@ import Foreign.Storable
import Graphics.GL.Core45 import Graphics.GL.Core45
mglCreateSingle :: (Ptr GLuint -> IO ()) -> IO GLuint mglCreateSingle :: (GLsizei -> Ptr GLuint -> IO ()) -> IO GLuint
mglCreateSingle f = do mglCreateSingle f = do
alloca $ \nameptr -> do alloca $ \nameptr -> do
f nameptr f 1 nameptr
peek nameptr peek nameptr
src/Preload/Render.hs
+26 -12
View File
@@ -5,6 +5,7 @@ module Preload.Render (
cleanUpRenderPreload, cleanUpRenderPreload,
) where ) where
import GLHelp
import Control.Lens import Control.Lens
import Control.Monad import Control.Monad
import Data.Preload.Render import Data.Preload.Render
@@ -18,6 +19,7 @@ import Shader.Bind
import Shader.Compile import Shader.Compile
import Shader.Data import Shader.Data
import Shader.Parameters import Shader.Parameters
import Graphics.GL.Core45
numDrawableWalls :: Int numDrawableWalls :: Int
numDrawableWalls = 5000 numDrawableWalls = 5000
@@ -39,12 +41,16 @@ preloadRender = do
, StreamDraw , StreamDraw
) )
let wpVBO = VBO{_vbo = wpVBOname, _vboPtr = wpVBOptr, _vboAttribSizes = [4, 4], _vboStride = 8} let wpVBO = VBO{_vbo = wpVBOname, _vboPtr = wpVBOptr, _vboAttribSizes = [4, 4], _vboStride = 8}
wpVAOname <- genObjectName -- wpVAOname <- genObjectName
bindVertexArrayObject $= Just wpVAOname -- bindVertexArrayObject $= Just wpVAOname
wpVAOname <- mglCreateSingle glGenVertexArrays
glBindVertexArray wpVAOname
bindBuffer ArrayBuffer $= Just wpVBOname bindBuffer ArrayBuffer $= Just wpVBOname
setupVertexAttribPointer 0 4 8 0 setupVertexAttribPointer 0 4 8 0
wpColVAOname <- genObjectName --wpColVAOname <- genObjectName
bindVertexArrayObject $= Just wpColVAOname --bindVertexArrayObject $= Just wpColVAOname
wpColVAOname <- mglCreateSingle glGenVertexArrays
glBindVertexArray wpColVAOname
setupVertexAttribPointer 0 4 8 0 setupVertexAttribPointer 0 4 8 0
setupVertexAttribPointer 1 4 8 4 setupVertexAttribPointer 1 4 8 4
let wpVAO = VAO{_vaoName = wpVAOname, _vaoVBO = wpVBO} let wpVAO = VAO{_vaoName = wpVAOname, _vaoVBO = wpVBO}
@@ -59,8 +65,10 @@ preloadRender = do
, StreamDraw , StreamDraw
) )
let winVBO = VBO{_vbo = winVBOname, _vboPtr = winVBOptr, _vboAttribSizes = [4, 4], _vboStride = 8} let winVBO = VBO{_vbo = winVBOname, _vboPtr = winVBOptr, _vboAttribSizes = [4, 4], _vboStride = 8}
winColVAOname <- genObjectName --winColVAOname <- genObjectName
bindVertexArrayObject $= Just winColVAOname --bindVertexArrayObject $= Just winColVAOname
winColVAOname <- mglCreateSingle glGenVertexArrays
glBindVertexArray winColVAOname
setupVertexAttribPointer 0 4 8 0 setupVertexAttribPointer 0 4 8 0
setupVertexAttribPointer 1 4 8 4 setupVertexAttribPointer 1 4 8 4
let winColVAO = VAO{_vaoName = winColVAOname, _vaoVBO = winVBO} let winColVAO = VAO{_vaoName = winColVAOname, _vaoVBO = winVBO}
@@ -83,22 +91,28 @@ preloadRender = do
, StreamDraw , StreamDraw
) )
let shVBO = VBO{_vbo = shVBOname, _vboPtr = shVBOptr, _vboAttribSizes = [4, 4], _vboStride = 8} let shVBO = VBO{_vbo = shVBOname, _vboPtr = shVBOptr, _vboAttribSizes = [4, 4], _vboStride = 8}
shPosColVAOname <- genObjectName --shPosColVAOname <- genObjectName
bindVertexArrayObject $= Just shPosColVAOname --bindVertexArrayObject $= Just shPosColVAOname
shPosColVAOname <- mglCreateSingle glGenVertexArrays
glBindVertexArray shPosColVAOname
bindBuffer ArrayBuffer $= Just shVBOname bindBuffer ArrayBuffer $= Just shVBOname
setupVertexAttribPointer 0 3 7 0 setupVertexAttribPointer 0 3 7 0
setupVertexAttribPointer 1 4 7 3 setupVertexAttribPointer 1 4 7 3
bindBuffer ElementArrayBuffer $= Just shEBOname bindBuffer ElementArrayBuffer $= Just shEBOname
shPosVAOname <- genObjectName --shPosVAOname <- genObjectName
bindVertexArrayObject $= Just shPosVAOname --bindVertexArrayObject $= Just shPosVAOname
shPosVAOname <- mglCreateSingle glGenVertexArrays
glBindVertexArray shPosVAOname
bindBuffer ArrayBuffer $= Just shVBOname bindBuffer ArrayBuffer $= Just shVBOname
setupVertexAttribPointer 0 3 7 0 setupVertexAttribPointer 0 3 7 0
bindBuffer ElementArrayBuffer $= Just shEBOname bindBuffer ElementArrayBuffer $= Just shEBOname
let shPosColVAO = VAO{_vaoName = shPosColVAOname, _vaoVBO = shVBO} let shPosColVAO = VAO{_vaoName = shPosColVAOname, _vaoVBO = shVBO}
shPosVAO = VAO{_vaoName = shPosVAOname, _vaoVBO = shVBO} shPosVAO = VAO{_vaoName = shPosVAOname, _vaoVBO = shVBO}
--setup silhouette edge VAO --setup silhouette edge VAO
shEdgeVAOname <- genObjectName --shEdgeVAOname <- genObjectName
bindVertexArrayObject $= Just shEdgeVAOname --bindVertexArrayObject $= Just shEdgeVAOname
shEdgeVAOname <- mglCreateSingle glGenVertexArrays
glBindVertexArray shEdgeVAOname
bindBuffer ArrayBuffer $= Just shVBOname bindBuffer ArrayBuffer $= Just shVBOname
setupVertexAttribPointer 0 3 7 0 setupVertexAttribPointer 0 3 7 0
--setup ebo for silhouette edges --setup ebo for silhouette edges
src/Render.hs
+8 -4
View File
@@ -81,7 +81,8 @@ createLightMap pdata lightPoints nWalls nSils nCaps drawObjShads toPos drawCPUSh
--uniform (_shadUnis lwallShad V.! 0) --uniform (_shadUnis lwallShad V.! 0)
-- $= Vector3 x y z -- $= Vector3 x y z
glUniform3f (_shadUnis' lwallShad V.! 0) x y z glUniform3f (_shadUnis' lwallShad V.! 0) x y z
bindVertexArrayObject $= lwallShad ^? shadVAO' . vaoName -- Just (_vao $ _shadVAO lwallShad) --bindVertexArrayObject $= lwallShad ^? shadVAO' . vaoName -- Just (_vao $ _shadVAO lwallShad)
glBindVertexArray $ lwallShad ^. shadVAO' . vaoName -- Just (_vao $ _shadVAO lwallShad)
glDrawArrays glDrawArrays
(marshalEPrimitiveMode $ _shadPrim' lwallShad) (marshalEPrimitiveMode $ _shadPrim' lwallShad)
0 0
@@ -95,7 +96,8 @@ createLightMap pdata lightPoints nWalls nSils nCaps drawObjShads toPos drawCPUSh
glUseProgram (_shadProg' llinesShad) glUseProgram (_shadProg' llinesShad)
glUniform3f (_shadUnis' llinesShad V.! 0) x y z glUniform3f (_shadUnis' llinesShad V.! 0) x y z
glUniform1f (_shadUnis' llinesShad V.! 1) rad glUniform1f (_shadUnis' llinesShad V.! 1) rad
bindVertexArrayObject $= Just (_vaoName $ _shadVAO' llinesShad) --bindVertexArrayObject $= Just (_vaoName $ _shadVAO' llinesShad)
glBindVertexArray (_vaoName $ _shadVAO' llinesShad)
glDrawElements glDrawElements
(marshalEPrimitiveMode $ _shadPrim' llinesShad) (marshalEPrimitiveMode $ _shadPrim' llinesShad)
(fromIntegral nSils) (fromIntegral nSils)
@@ -107,7 +109,8 @@ createLightMap pdata lightPoints nWalls nSils nCaps drawObjShads toPos drawCPUSh
--uniform (_shadUnis lcapShad V.! 0) $= Vector3 x y z --uniform (_shadUnis lcapShad V.! 0) $= Vector3 x y z
glUseProgram (_shadProg' lcapShad) glUseProgram (_shadProg' lcapShad)
glUniform3f (_shadUnis' lcapShad V.! 0) x y z glUniform3f (_shadUnis' lcapShad V.! 0) x y z
bindVertexArrayObject $= lcapShad ^? shadVAO' . vaoName --Just (_vao $ _shadVAO lcapShad) --bindVertexArrayObject $= lcapShad ^? shadVAO' . vaoName --Just (_vao $ _shadVAO lcapShad)
glBindVertexArray $ lcapShad ^. shadVAO' . vaoName --Just (_vao $ _shadVAO lcapShad)
glDrawElements glDrawElements
(marshalEPrimitiveMode $ _shadPrim' lcapShad) (marshalEPrimitiveMode $ _shadPrim' lcapShad)
(fromIntegral nCaps) (fromIntegral nCaps)
@@ -128,7 +131,8 @@ createLightMap pdata lightPoints nWalls nSils nCaps drawObjShads toPos drawCPUSh
glUseProgram (ltextShad ^. shadProg') --Just (_shadProg ltextShad) glUseProgram (ltextShad ^. shadProg') --Just (_shadProg ltextShad)
glUniform3f (_shadUnis' ltextShad V.! 0) x y z glUniform3f (_shadUnis' ltextShad V.! 0) x y z
glUniform4f (_shadUnis' ltextShad V.! 1) r g b rad glUniform4f (_shadUnis' ltextShad V.! 1) r g b rad
bindVertexArrayObject $= ltextShad ^? shadVAO' . vaoName -- Just (_vao $ _shadVAO ltextShad) --bindVertexArrayObject $= ltextShad ^? shadVAO' . vaoName -- Just (_vao $ _shadVAO ltextShad)
glBindVertexArray $ ltextShad ^. shadVAO' . vaoName -- Just (_vao $ _shadVAO ltextShad)
glDrawArrays glDrawArrays
(marshalEPrimitiveMode (_shadPrim' ltextShad)) (marshalEPrimitiveMode (_shadPrim' ltextShad))
0 0
src/Shader.hs
+5 -2
View File
@@ -7,6 +7,7 @@ module Shader
, pokeBindFoldable , pokeBindFoldable
, pokeBindFoldableLayer , pokeBindFoldableLayer
) where ) where
import Control.Lens
import Shader.Data import Shader.Data
import Shader.Parameters import Shader.Parameters
import Shader.ExtraPrimitive import Shader.ExtraPrimitive
@@ -27,7 +28,8 @@ drawShaderLay l countsVector shadIn fs = do
i <- UMV.read countsVector shadIn i <- UMV.read countsVector shadIn
--currentProgram $= Just (_shadProg' fs) --currentProgram $= Just (_shadProg' fs)
glUseProgram (_shadProg' fs) glUseProgram (_shadProg' fs)
bindVertexArrayObject $= Just (_vaoName $ _shadVAO' fs) glBindVertexArray $ fs ^. shadVAO' . vaoName
--bindVertexArrayObject $= Just (_vaoName $ _shadVAO' fs)
case _shadTex' fs of case _shadTex' fs of
Just ShaderTexture{_textureObject = txo} --, _textureTarget = tt} Just ShaderTexture{_textureObject = txo} --, _textureTarget = tt}
-- -> textureBinding Texture2D $= Just txo -- -> textureBinding Texture2D $= Just txo
@@ -44,7 +46,8 @@ drawShader :: FullShader' -> Int -> IO ()
drawShader fs i = do drawShader fs i = do
--currentProgram $= Just (_shadProg fs) --currentProgram $= Just (_shadProg fs)
glUseProgram (_shadProg' fs) glUseProgram (_shadProg' fs)
bindVertexArrayObject $= Just (_vaoName $ _shadVAO' fs) glBindVertexArray $ fs ^. shadVAO' . vaoName
--bindVertexArrayObject $= Just (_vaoName $ _shadVAO' fs)
case _shadTex' fs of case _shadTex' fs of
Just ShaderTexture{_textureObject = txo Just ShaderTexture{_textureObject = txo
} --, _textureTarget = tt } } --, _textureTarget = tt }
src/Shader/AuxAddition.hs
+2 -2
View File
@@ -38,7 +38,7 @@ addTexture2D nlev minfilt magfilt texpath shad = do
let texdata = convertRGBA8 cmap let texdata = convertRGBA8 cmap
let wtex = fromIntegral $ imageWidth texdata let wtex = fromIntegral $ imageWidth texdata
htex = fromIntegral $ imageHeight texdata htex = fromIntegral $ imageHeight texdata
texname <- mglCreateSingle $ glCreateTextures GL_TEXTURE_2D 1 texname <- mglCreateSingle $ glCreateTextures GL_TEXTURE_2D
glTextureStorage2D texname nlev GL_RGBA8 wtex htex glTextureStorage2D texname nlev GL_RGBA8 wtex htex
VS.unsafeWith (imageData texdata) $ \ptr -> do VS.unsafeWith (imageData texdata) $ \ptr -> do
glTextureSubImage2D texname 0 0 0 wtex htex GL_RGBA GL_UNSIGNED_BYTE ptr glTextureSubImage2D texname 0 0 0 wtex htex GL_RGBA GL_UNSIGNED_BYTE ptr
@@ -69,7 +69,7 @@ addTextureArray texturePath shad = do
print err print err
Right cmap <- readImage texturePath Right cmap <- readImage texturePath
let texdata = convertRGBA8 cmap let texdata = convertRGBA8 cmap
texname <- mglCreateSingle $ glCreateTextures GL_TEXTURE_2D_ARRAY 1 texname <- mglCreateSingle $ glCreateTextures GL_TEXTURE_2D_ARRAY
glTextureStorage3D texname 3 GL_RGBA8 32 32 64 glTextureStorage3D texname 3 GL_RGBA8 32 32 64
VS.unsafeWith (imageData texdata) $ \ptr -> do VS.unsafeWith (imageData texdata) $ \ptr -> do
glTextureSubImage3D texname 0 0 0 0 32 32 64 GL_RGBA GL_UNSIGNED_BYTE ptr glTextureSubImage3D texname 0 0 0 0 32 32 64 GL_RGBA GL_UNSIGNED_BYTE ptr
src/Shader/Compile.hs
+11 -6
View File
@@ -8,6 +8,7 @@ module Shader.Compile (
setupVertexAttribPointer, setupVertexAttribPointer,
) where ) where
import GLHelp
import Control.Monad import Control.Monad
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import qualified Data.ByteString.Unsafe as BU import qualified Data.ByteString.Unsafe as BU
@@ -129,23 +130,27 @@ shaderTypeExt' _ = undefined
-- I think that this requires that the correct shader program is bound? -- I think that this requires that the correct shader program is bound?
setupVAO :: [Int] -> IO VAO setupVAO :: [Int] -> IO VAO
setupVAO sizes = do setupVAO sizes = do
theVAO <- genObjectName --theVAO <- genObjectName
bindVertexArrayObject $= Just theVAO --bindVertexArrayObject $= Just theVAO
vaoname <- mglCreateSingle glGenVertexArrays
glBindVertexArray vaoname
theVBO <- setupVBO sizes theVBO <- setupVBO sizes
return $ return $
VAO VAO
{ _vaoName = theVAO { _vaoName = vaoname
, _vaoVBO = theVBO , _vaoVBO = theVBO
} }
setupVAOSized :: [Int] -> Int -> IO VAO setupVAOSized :: [Int] -> Int -> IO VAO
setupVAOSized sizes ndraw = do setupVAOSized sizes ndraw = do
theVAO <- genObjectName vaoname <- mglCreateSingle glGenVertexArrays
bindVertexArrayObject $= Just theVAO glBindVertexArray vaoname
-- theVAO <- genObjectName
--bindVertexArrayObject $= Just theVAO
theVBO <- setupVBOSized sizes ndraw theVBO <- setupVBOSized sizes ndraw
return $ return $
VAO VAO
{ _vaoName = theVAO { _vaoName = vaoname
, _vaoVBO = theVBO , _vaoVBO = theVBO
} }
src/Shader/Data.hs
+1 -1
View File
@@ -45,7 +45,7 @@ data FullShader' = FullShader'
{- | Vertex array object: contains the reference to the object, {- | Vertex array object: contains the reference to the object,
and its buffer targets. -} and its buffer targets. -}
data VAO = VAO data VAO = VAO
{ _vaoName :: VertexArrayObject { _vaoName :: GLuint
, _vaoVBO :: VBO , _vaoVBO :: VBO
} }
{- | Vertex buffer object: contains the reference to the object, {- | Vertex buffer object: contains the reference to the object,