Cleanup: remove uniforms from shader datatype

2023-03-20 01:19:10 +00:00
parent 33f31aa385
commit 32ecf46343
17 changed files with 24 additions and 99 deletions
@@ -24,14 +24,10 @@ drawShaderLay :: Int -> UMV.MVector (PrimState IO) Int -> Int -> (FullShader,VBO
 {-# INLINE drawShaderLay #-}
 drawShaderLay l countsVector shadIn fs = do 
    i <- UMV.read countsVector shadIn
-    --currentProgram $= Just (_shadProg' fs)
    glUseProgram (_shadName $ fst fs)
    glBindVertexArray $ fs ^. _1 . shadVAO . vaoName
-    --bindVertexArrayObject $= Just (_vaoName $ _shadVAO' fs)
    case _shadTex' $ fst fs of 
        Just ShaderTexture{_textureObject = txo} --, _textureTarget = tt}
-            -- -> textureBinding Texture2D $= Just txo
-            -- -> glBindTexture tt txo
            -> glBindTextureUnit 0 txo
        _   -> return ()
    glDrawArrays