Partial support for multisample textures.

Author: svenpanne

Graphics/Rendering/OpenGL/GL/QueryUtils/PName.hs

@@ -511,6 +511,10 @@ data PName1I
     | GetMaxCubeMapTextureSize          -- ^ int
     | GetMaxRectangleTextureSize        -- ^ int
     | GetMaxArrayTextureLayers          -- ^ int
+    | GetMaxSampleMaskWords             -- ^ int
+    | GetMaxColorTextureSamples         -- ^ int
+    | GetMaxDepthTextureSamples         -- ^ int
+    | GetMaxIntegerSamples              -- ^ int
     -- ReadCopyPixels
     | GetReadBuffer                 -- ^ enum
     -- Texture Objects
@@ -767,6 +771,10 @@ instance GetPName PName1I where
         GetMaxCubeMapTextureSize -> Just gl_MAX_CUBE_MAP_TEXTURE_SIZE
         GetMaxRectangleTextureSize -> Just gl_MAX_RECTANGLE_TEXTURE_SIZE
         GetMaxArrayTextureLayers -> Just gl_MAX_ARRAY_TEXTURE_LAYERS
+        GetMaxSampleMaskWords -> Just gl_MAX_SAMPLE_MASK_WORDS
+        GetMaxColorTextureSamples -> Just gl_MAX_COLOR_TEXTURE_SAMPLES
+        GetMaxDepthTextureSamples -> Just gl_MAX_DEPTH_TEXTURE_SAMPLES
+        GetMaxIntegerSamples -> Just gl_MAX_INTEGER_SAMPLES
         -- ReadCopyPixels
         GetReadBuffer -> Just gl_READ_BUFFER
         -- Texture Objects

Graphics/Rendering/OpenGL/GL/Texturing/Specification.hs

@@ -63,13 +63,19 @@ module Graphics.Rendering.OpenGL.GL.Texturing.Specification (
    compressedTexSubImage1D, compressedTexSubImage2D, compressedTexSubImage3D,
    getCompressedTexImage,
 
-  -- * Implementation-Dependent Limits
-  maxTextureSize, maxCubeMapTextureSize, maxRectangleTextureSize,
-  max3DTextureSize, maxArrayTextureLayers
+   -- * Multisample Texture Images
+   SampleLocations(..), texImage2DMultisample, texImage3DMultisample,
+
+   -- * Implementation-Dependent Limits
+   maxTextureSize, maxCubeMapTextureSize, maxRectangleTextureSize,
+   max3DTextureSize, maxArrayTextureLayers, maxSampleMaskWords,
+   maxColorTextureSamples, maxDepthTextureSamples, maxIntegerSamples
 ) where
 
 import Foreign.Ptr
 import Graphics.Rendering.OpenGL.GL.CoordTrans
+import Graphics.Rendering.OpenGL.GL.FramebufferObjects.RenderbufferTarget
+import Graphics.Rendering.OpenGL.GL.GLboolean
 import Graphics.Rendering.OpenGL.GL.PixelData
 import Graphics.Rendering.OpenGL.GL.PixelRectangles
 import Graphics.Rendering.OpenGL.GL.QueryUtils
@@ -339,6 +345,54 @@ compressedTexSubImage3D target level (TexturePosition3D xOff yOff zOff) (Texture
 
 --------------------------------------------------------------------------------
 
+data SampleLocations =
+     FlexibleSampleLocations
+   | FixedSampleLocations
+   deriving ( Eq, Ord, Show )
+
+marshalSampleLocations :: SampleLocations -> GLboolean
+marshalSampleLocations = marshalGLboolean . (FixedSampleLocations ==)
+
+{-
+unmarshalSampleLocations :: GLboolean -> SampleLocations
+unmarshalSampleLocations x =
+   if unmarshalGLboolean x
+      then FixedSampleLocations
+      else FlexibleSampleLocations
+-}
+
+--------------------------------------------------------------------------------
+
+texImage2DMultisample :: TextureTarget2DMultisample
+                      -> Proxy
+                      -> Samples
+                      -> PixelInternalFormat
+                      -> TextureSize2D
+                      -> SampleLocations
+                      -> IO ()
+texImage2DMultisample target proxy (Samples s) int (TextureSize2D w h) loc =
+   glTexImage2DMultisample
+      (marshalMultisample proxy target) s (marshalPixelInternalFormat int)
+      w h (marshalSampleLocations loc)
+
+marshalMultisample :: ParameterizedTextureTarget t => Proxy -> t -> GLenum
+marshalMultisample proxy = case proxy of
+   NoProxy -> marshalParameterizedTextureTarget
+   Proxy -> marshalParameterizedTextureTargetProxy
+
+texImage3DMultisample :: TextureTarget2DMultisampleArray
+                      -> Proxy
+                      -> Samples
+                      -> PixelInternalFormat
+                      -> TextureSize3D
+                      -> SampleLocations
+                      -> IO ()
+texImage3DMultisample target proxy (Samples s) int (TextureSize3D w h d) loc =
+   glTexImage3DMultisample
+      (marshalMultisample proxy target) s (marshalPixelInternalFormat int)
+      w h d (marshalSampleLocations loc)
+
+--------------------------------------------------------------------------------
 maxTextureSize :: GettableStateVar GLsizei
 maxTextureSize = maxTextureSizeWith GetMaxTextureSize
 
@@ -354,5 +408,17 @@ max3DTextureSize = maxTextureSizeWith GetMax3DTextureSize
 maxArrayTextureLayers :: GettableStateVar GLsizei
 maxArrayTextureLayers = maxTextureSizeWith GetMaxArrayTextureLayers
 
+maxSampleMaskWords :: GettableStateVar GLsizei
+maxSampleMaskWords = maxTextureSizeWith GetMaxSampleMaskWords
+
+maxColorTextureSamples :: GettableStateVar GLsizei
+maxColorTextureSamples = maxTextureSizeWith GetMaxColorTextureSamples
+
+maxDepthTextureSamples :: GettableStateVar GLsizei
+maxDepthTextureSamples = maxTextureSizeWith GetMaxDepthTextureSamples
+
+maxIntegerSamples :: GettableStateVar GLsizei
+maxIntegerSamples = maxTextureSizeWith GetMaxIntegerSamples
+
 maxTextureSizeWith :: PName1I -> GettableStateVar GLsizei
 maxTextureSizeWith = makeGettableStateVar . getInteger1 fromIntegral