Fixed signatures of patchVertices, maxPatchVertices and maxTessellati…

…onLevel. Renamed maxTessellationLevel to maxTessGenLevel.
haskell-opengl · Mar 6, 2015 · df5dc42 · df5dc42 · hesiod · Mar 8, 2015
1 parent e59f1fd
commit df5dc42
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/Graphics/Rendering/OpenGL/GL/PrimitiveMode.hs b/src/Graphics/Rendering/OpenGL/GL/PrimitiveMode.hs
@@ -82,10 +82,12 @@ data PrimitiveMode =
 -- 'patchVertices' is set to a value less than or equal to zero or greater
 -- than the implementation-dependent maximum value 'maxPatchVertices'.
 
-patchVertices :: SettableStateVar GLint
-patchVertices = makeSettableStateVar $ glPatchParameteri gl_PATCH_VERTICES
+patchVertices :: StateVar GLsizei
+patchVertices =
+  makeStateVar (getSizei1 id GetMaxPatchVertices)
+               (glPatchParameteri gl_PATCH_VERTICES . fromIntegral)
 
 -- | Contains the maximumum number of vertices in a single patch.
 
-maxPatchVertices :: GettableStateVar GLint
-maxPatchVertices = makeGettableStateVar $ getInteger1 id GetMaxPatchVertices
+maxPatchVertices :: GettableStateVar GLsizei
+maxPatchVertices = makeGettableStateVar $ getSizei1 id GetMaxPatchVertices
diff --git a/src/Graphics/Rendering/OpenGL/GL/QueryUtils/PName.hs b/src/Graphics/Rendering/OpenGL/GL/QueryUtils/PName.hs
@@ -370,8 +370,9 @@ data PName1I
     | GetMaxVertexAttribs               -- ^ sizei
     | GetMaxVaryingFloats               -- ^ sizei
     -- tessellation
-    | GetMaxPatchVertices               -- ^ int
-    | GetMaxTessellationLevel           -- ^ int
+    | GetPatchVertices                  -- ^ sizei
+    | GetMaxPatchVertices               -- ^ sizei
+    | GetMaxTessGenLevel                -- ^ sizei
     -- coordtrans
     | GetMatrixMode                 -- ^ enum
     | GetModelviewStackDepth        -- ^ sizei
@@ -639,8 +640,9 @@ instance GetPName PName1I where
         GetMaxVaryingFloats -> Just gl_MAX_VARYING_COMPONENTS
         GetMaxVertexAttribs -> Just gl_MAX_VERTEX_ATTRIBS
         -- tessellation
+        GetPatchVertices -> Just gl_PATCH_VERTICES
         GetMaxPatchVertices -> Just gl_MAX_PATCH_VERTICES
-        GetMaxTessellationLevel -> Just gl_MAX_TESS_GEN_LEVEL
+        GetMaxTessGenLevel -> Just gl_MAX_TESS_GEN_LEVEL
         -- coordtrans
         GetMatrixMode -> Just gl_MATRIX_MODE
         GetModelviewStackDepth -> Just gl_MODELVIEW_STACK_DEPTH

diff --git a/src/Graphics/Rendering/OpenGL/GL/Shaders/Limits.hs b/src/Graphics/Rendering/OpenGL/GL/Shaders/Limits.hs
@@ -16,7 +16,7 @@ module Graphics.Rendering.OpenGL.GL.Shaders.Limits (
    maxVertexTextureImageUnits, maxTextureImageUnits,
    maxCombinedTextureImageUnits, maxTextureCoords, maxVertexUniformComponents,
    maxFragmentUniformComponents, maxVertexAttribs, maxVaryingFloats,
-   maxTessellationLevel
+   maxTessGenLevel
 ) where
 
 import Graphics.Rendering.OpenGL.GL.StateVar
@@ -79,8 +79,8 @@ maxVaryingFloats = getLimit GetMaxVaryingFloats
 
 -- | Contains the maximum allowed tessellation level.
 
-maxTessellationLevel :: GettableStateVar GLint
-maxTessellationLevel = makeGettableStateVar $ getInteger1 id GetMaxTessellationLevel
+maxTessGenLevel :: GettableStateVar GLsizei
+maxTessGenLevel = makeGettableStateVar $ getSizei1 id GetMaxTessGenLevel
 
 getLimit :: PName1I -> GettableStateVar GLsizei
 getLimit = makeGettableStateVar . getSizei1 id