Skip to content

Commit

Permalink
Synched with latest raw API.
Browse files Browse the repository at this point in the history
  • Loading branch information
svenpanne committed Feb 18, 2015
1 parent ddc9909 commit ceefa7f
Show file tree
Hide file tree
Showing 18 changed files with 92 additions and 107 deletions.
4 changes: 2 additions & 2 deletions OpenGL.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: OpenGL
version: 2.10.0.1
version: 2.10.0.2
synopsis: A binding for the OpenGL graphics system
description:
A Haskell binding for the OpenGL graphics system (GL, version 4.4) and its
Expand Down Expand Up @@ -146,7 +146,7 @@ library
hs-source-dirs: src
ghc-options: -Wall -O2
build-depends:
base >= 3 && < 5, bytestring, text, OpenGLRaw >= 1.4.1.0, GLURaw >= 1.3.0.0
base >= 3 && < 5, bytestring, text, OpenGLRaw >= 2.1, GLURaw >= 1.3.0.0
default-language: Haskell2010
other-extensions:
CPP
Expand Down
2 changes: 1 addition & 1 deletion src/Graphics/Rendering/OpenGL/GL/BeginEnd.hs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ renderPrim brack_ beginMode =
--------------------------------------------------------------------------------

primitiveRestart :: IO ()
primitiveRestart = glPrimitiveRestart
primitiveRestart = glPrimitiveRestartNV

--------------------------------------------------------------------------------

Expand Down
22 changes: 10 additions & 12 deletions src/Graphics/Rendering/OpenGL/GL/Capability.hs
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,14 @@ marshalEnableCap x = case x of
CapEdgeFlagArray -> Just gl_EDGE_FLAG_ARRAY
CapFogCoordArray -> Just gl_FOG_COORD_ARRAY
CapSecondaryColorArray -> Just gl_SECONDARY_COLOR_ARRAY
CapMatrixIndexArray -> Just gl_MATRIX_INDEX_ARRAY
CapMatrixIndexArray -> Just gl_MATRIX_INDEX_ARRAY_ARB
CapConvolution1D -> Just gl_CONVOLUTION_1D
CapConvolution2D -> Just gl_CONVOLUTION_2D
CapSeparable2D -> Just gl_SEPARABLE_2D
CapHistogram -> Just gl_HISTOGRAM
CapMinmax -> Just gl_MINMAX
CapRescaleNormal -> Just gl_RESCALE_NORMAL
CapSharedTexturePalette -> Just gl_SHARED_TEXTURE_PALETTE
CapSharedTexturePalette -> Just gl_SHARED_TEXTURE_PALETTE_EXT
CapMultisample -> Just gl_MULTISAMPLE
CapSampleAlphaToCoverage -> Just gl_SAMPLE_ALPHA_TO_COVERAGE
CapSampleAlphaToOne -> Just gl_SAMPLE_ALPHA_TO_ONE
Expand All @@ -222,20 +222,18 @@ marshalEnableCap x = case x of
CapPostConvolutionColorTable -> Just gl_POST_CONVOLUTION_COLOR_TABLE
CapPostColorMatrixColorTable -> Just gl_POST_COLOR_MATRIX_COLOR_TABLE
CapColorSum -> Just gl_COLOR_SUM
CapWeightSumUnity -> Just gl_WEIGHT_SUM_UNITY
CapVertexBlend -> Just gl_VERTEX_BLEND
CapWeightArray -> Just gl_WEIGHT_ARRAY
CapMatrixPalette -> Just gl_MATRIX_PALETTE
CapWeightSumUnity -> Just gl_WEIGHT_SUM_UNITY_ARB
CapVertexBlend -> Just gl_VERTEX_BLEND_ARB
CapWeightArray -> Just gl_WEIGHT_ARRAY_ARB
CapMatrixPalette -> Just gl_MATRIX_PALETTE_ARB
CapDepthClamp -> Just gl_DEPTH_CLAMP
CapDepthBoundsTest -> Just gl_DEPTH_BOUNDS_TEST
CapDepthBoundsTest -> Just gl_DEPTH_BOUNDS_TEST_EXT
CapPrimitiveRestart -> Just gl_PRIMITIVE_RESTART
CapPointSprite -> Just gl_POINT_SPRITE
CapStencilTestTwoSide -> Just gl_STENCIL_TEST_TWO_SIDE
-- TODO: use RASTER_POSITION_UNCLIPPED_IBM from IBM_rasterpos_clip extension
CapRasterPositionUnclipped -> Just 0x19262
CapStencilTestTwoSide -> Just gl_STENCIL_TEST_TWO_SIDE_EXT
CapRasterPositionUnclipped -> Just gl_RASTER_POSITION_UNCLIPPED_IBM
CapRasterizerDiscard -> Just gl_RASTERIZER_DISCARD
-- TODO: use TEXTURE_COLOR_TABLE_SGI from SGI_texture_color_table extension
CapTextureColorTable -> Just 0x80bc
CapTextureColorTable -> Just gl_TEXTURE_COLOR_TABLE_SGI
CapVertexProgramPointSize -> Just gl_VERTEX_PROGRAM_POINT_SIZE
CapVertexProgramTwoSide -> Just gl_VERTEX_PROGRAM_TWO_SIDE

Expand Down
4 changes: 2 additions & 2 deletions src/Graphics/Rendering/OpenGL/GL/CoordTrans.hs
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,14 @@ marshalMatrixMode x = case x of
Projection -> Just gl_PROJECTION
Texture -> Just gl_TEXTURE
Color -> Just gl_COLOR
MatrixPalette -> Just gl_MATRIX_PALETTE
MatrixPalette -> Just gl_MATRIX_PALETTE_ARB

unmarshalMatrixMode :: GLenum -> MatrixMode
unmarshalMatrixMode x
| x == gl_PROJECTION = Projection
| x == gl_TEXTURE = Texture
| x == gl_COLOR = Color
| x == gl_MATRIX_PALETTE = MatrixPalette
| x == gl_MATRIX_PALETTE_ARB = MatrixPalette
| otherwise =
case modelviewEnumToIndex x of
Just i -> Modelview i
Expand Down
12 changes: 4 additions & 8 deletions src/Graphics/Rendering/OpenGL/GL/DataType.hs
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,8 @@ marshalDataType x = case x of
UnsignedInt5999Rev -> gl_UNSIGNED_INT_5_9_9_9_REV
Float32UnsignedInt248Rev -> gl_FLOAT_32_UNSIGNED_INT_24_8_REV
Bitmap -> gl_BITMAP
-- TODO: Use UNSIGNED_SHORT_8_8_APPLE from APPLE_ycbcr_422 extension
UnsignedShort88 -> 0x85ba
-- TODO: Use UNSIGNED_SHORT_8_8_REV_APPLE from APPLE_ycbcr_422 extension
UnsignedShort88Rev -> 0x85bb
UnsignedShort88 -> gl_UNSIGNED_SHORT_8_8_APPLE
UnsignedShort88Rev -> gl_UNSIGNED_SHORT_8_8_REV_APPLE
Double -> gl_DOUBLE
TwoBytes -> gl_2_BYTES
ThreeBytes -> gl_3_BYTES
Expand Down Expand Up @@ -120,10 +118,8 @@ unmarshalDataType x
| x == gl_UNSIGNED_INT_5_9_9_9_REV = UnsignedInt5999Rev
| x == gl_FLOAT_32_UNSIGNED_INT_24_8_REV = Float32UnsignedInt248Rev
| x == gl_BITMAP = Bitmap
-- TODO: Use UNSIGNED_SHORT_8_8_APPLE from APPLE_ycbcr_422 extension
| x == 0x85ba = UnsignedShort88
-- TODO: Use UNSIGNED_SHORT_8_8_REV_APPLE from APPLE_ycbcr_422 extension
| x == 0x85bb = UnsignedShort88Rev
| x == gl_UNSIGNED_SHORT_8_8_APPLE = UnsignedShort88
| x == gl_UNSIGNED_SHORT_8_8_REV_APPLE = UnsignedShort88Rev
| x == gl_DOUBLE = Double
| x == gl_2_BYTES = TwoBytes
| x == gl_3_BYTES = ThreeBytes
Expand Down
15 changes: 5 additions & 10 deletions src/Graphics/Rendering/OpenGL/GL/Fog.hs
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ marshalFogParameter x = case x of
FogMode -> gl_FOG_MODE
FogColor -> gl_FOG_COLOR
FogCoordSrc -> gl_FOG_COORD_SRC
-- TODO: Use FOG_DISTANCE_MODE_NV from NV_fog_distance extension
FogDistanceMode -> 0x855a
FogDistanceMode -> gl_FOG_DISTANCE_MODE_NV

--------------------------------------------------------------------------------

Expand Down Expand Up @@ -178,19 +177,15 @@ data FogDistanceMode =

marshalFogDistanceMode :: FogDistanceMode -> GLint
marshalFogDistanceMode x = fromIntegral $ case x of
-- TODO: Use EYE_RADIAL_NV from NV_fog_distance extension
EyeRadial -> 0x855b
EyeRadial -> gl_EYE_RADIAL_NV
EyePlaneSigned ->gl_EYE_PLANE
-- TODO: Use EYE_PLANE_ABSOLUTE_NV from NV_fog_distance extension
EyePlaneAbsolute -> 0x855c
EyePlaneAbsolute -> gl_EYE_PLANE_ABSOLUTE_NV

unmarshalFogDistanceMode :: GLint -> FogDistanceMode
unmarshalFogDistanceMode x
-- TODO: Use EYE_RADIAL_NV from NV_fog_distance extension
| y == 0x855b = EyeRadial
| y == gl_EYE_RADIAL_NV = EyeRadial
| y == gl_EYE_PLANE = EyePlaneSigned
-- TODO: Use EYE_PLANE_ABSOLUTE_NV from NV_fog_distance extension
| y == 0x855c = EyePlaneAbsolute
| y == gl_EYE_PLANE_ABSOLUTE_NV = EyePlaneAbsolute
| otherwise = error ("unmarshalFogDistanceMode: illegal value " ++ show x)
where y = fromIntegral x

Expand Down
4 changes: 2 additions & 2 deletions src/Graphics/Rendering/OpenGL/GL/Hints.hs
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ marshalHintTarget x = case x of
Fog -> gl_FOG_HINT
GenerateMipmap -> gl_GENERATE_MIPMAP_HINT
TextureCompression -> gl_TEXTURE_COMPRESSION_HINT
PackCMYK -> gl_PACK_CMYK_HINT
UnpackCMYK -> gl_UNPACK_CMYK_HINT
PackCMYK -> gl_PACK_CMYK_HINT_EXT
UnpackCMYK -> gl_UNPACK_CMYK_HINT_EXT

hintTargetToGetPName :: HintTarget -> PName1I
hintTargetToGetPName x = case x of
Expand Down
4 changes: 2 additions & 2 deletions src/Graphics/Rendering/OpenGL/GL/PerFragment.hs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ depthBounds =
makeStateVarMaybe
(return CapDepthBoundsTest)
(getClampd2 (,) GetDepthBounds)
(uncurry glDepthBounds)
(uncurry glDepthBoundsEXT)

--------------------------------------------------------------------------------

Expand Down Expand Up @@ -200,7 +200,7 @@ activeStencilFace =
makeStateVarMaybe
(return CapStencilTestTwoSide)
(getEnum1 unmarshalFace GetActiveStencilFace)
(glActiveStencilFace . marshalFace)
(glActiveStencilFaceEXT . marshalFace)

--------------------------------------------------------------------------------

Expand Down
34 changes: 16 additions & 18 deletions src/Graphics/Rendering/OpenGL/GL/PixelFormat.hs
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,16 @@ marshalPixelFormat x = case x of
RGBAInteger -> gl_RGBA_INTEGER
BGRInteger -> gl_BGR_INTEGER
BGRAInteger -> gl_BGRA_INTEGER
ABGR -> gl_ABGR
ABGR -> gl_ABGR_EXT
BGR -> gl_BGR
BGRA -> gl_BGRA
CMYK -> gl_CMYK
CMYKA -> gl_CMYKA
FourTwoTwo -> gl_422
FourTwoTwoRev -> gl_422_REV
FourTwoTwoAverage -> gl_422_AVERAGE
FourTwoTwoRevAverage -> gl_422_REV_AVERAGE
-- TODO: Use YCBCR_422_APPLE from APPLE_ycbcr_422 extension
YCBCR422 -> 0x85B9
CMYK -> gl_CMYK_EXT
CMYKA -> gl_CMYKA_EXT
FourTwoTwo -> gl_422_EXT
FourTwoTwoRev -> gl_422_REV_EXT
FourTwoTwoAverage -> gl_422_AVERAGE_EXT
FourTwoTwoRevAverage -> gl_422_REV_AVERAGE_EXT
YCBCR422 -> gl_YCBCR_422_APPLE
DepthStencil -> gl_DEPTH_STENCIL

unmarshalPixelFormat :: GLenum -> PixelFormat
Expand All @@ -115,16 +114,15 @@ unmarshalPixelFormat x
| x == gl_RGBA_INTEGER = RGBAInteger
| x == gl_BGR_INTEGER = BGRInteger
| x == gl_BGRA_INTEGER = BGRAInteger
| x == gl_ABGR = ABGR
| x == gl_ABGR_EXT = ABGR
| x == gl_BGR = BGR
| x == gl_BGRA = BGRA
| x == gl_CMYK = CMYK
| x == gl_CMYKA = CMYKA
| x == gl_422 = FourTwoTwo
| x == gl_422_REV = FourTwoTwoRev
| x == gl_422_AVERAGE = FourTwoTwoAverage
| x == gl_422_REV_AVERAGE = FourTwoTwoRevAverage
-- TODO: Use YCBCR_422_APPLE from APPLE_ycbcr_422 extension
| x == 0x85B9 = YCBCR422
| x == gl_CMYK_EXT = CMYK
| x == gl_CMYKA_EXT = CMYKA
| x == gl_422_EXT = FourTwoTwo
| x == gl_422_REV_EXT = FourTwoTwoRev
| x == gl_422_AVERAGE_EXT = FourTwoTwoAverage
| x == gl_422_REV_AVERAGE_EXT = FourTwoTwoRevAverage
| x == gl_YCBCR_422_APPLE = YCBCR422
| x == gl_DEPTH_STENCIL = DepthStencil
| otherwise = error ("unmarshalPixelFormat: illegal value " ++ show x)
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,8 @@ marshalColorTable x = case x of
Texture2DColorTable -> gl_TEXTURE_2D
Texture3DColorTable -> gl_TEXTURE_3D
TextureCubeMapColorTable -> gl_TEXTURE_CUBE_MAP
-- TODO: Use TEXTURE_COLOR_TABLE_SGI from SGI_texture_color_table extension
TextureColorTable -> 0x80bc
SharedTexturePalette -> gl_SHARED_TEXTURE_PALETTE
TextureColorTable -> gl_TEXTURE_COLOR_TABLE_SGI
SharedTexturePalette -> gl_SHARED_TEXTURE_PALETTE_EXT

--------------------------------------------------------------------------------

Expand All @@ -109,8 +108,7 @@ marshalProxyColorTable Proxy x = case x of
Texture2DColorTable -> Just gl_PROXY_TEXTURE_2D
Texture3DColorTable -> Just gl_PROXY_TEXTURE_3D
TextureCubeMapColorTable -> Just gl_PROXY_TEXTURE_CUBE_MAP
-- TODO: Use PROXY_TEXTURE_COLOR_TABLE_SGI from SGI_texture_color_table extension
TextureColorTable -> Just 0x80bd
TextureColorTable -> Just gl_TEXTURE_COLOR_TABLE_SGI
SharedTexturePalette -> Nothing

--------------------------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions src/Graphics/Rendering/OpenGL/GL/QueryUtils.hs
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ maxLightIndex = 0xFFF

modelviewIndexToEnum :: GLsizei -> Maybe GLenum
modelviewIndexToEnum 0 = Just gl_MODELVIEW
modelviewIndexToEnum 1 = Just gl_MODELVIEW1
modelviewIndexToEnum 1 = Just gl_MODELVIEW1_ARB
modelviewIndexToEnum i
| 2 <= i && i <= 31 = Just (gl_MODELVIEW2 - 2 + fromIntegral i)
| 2 <= i && i <= 31 = Just (gl_MODELVIEW2_ARB - 2 + fromIntegral i)
| otherwise = Nothing

modelviewEnumToIndex :: GLenum -> Maybe GLsizei
modelviewEnumToIndex x
| x == gl_MODELVIEW = Just 0
| x == gl_MODELVIEW1 = Just 1
| gl_MODELVIEW2 <= x && x <= gl_MODELVIEW31 = Just (fromIntegral (x - (gl_MODELVIEW2 - 2)))
| x == gl_MODELVIEW1_ARB = Just 1
| gl_MODELVIEW2_ARB <= x && x <= gl_MODELVIEW31_ARB = Just (fromIntegral (x - (gl_MODELVIEW2_ARB - 2)))
| otherwise = Nothing

--------------------------------------------------------------------------------
Expand Down
28 changes: 14 additions & 14 deletions src/Graphics/Rendering/OpenGL/GL/QueryUtils/PName.hs
Original file line number Diff line number Diff line change
Expand Up @@ -579,8 +579,8 @@ instance GetPName PName1I where
GetFogHint -> Just gl_FOG_HINT
GetGenerateMipmapHint -> Just gl_GENERATE_MIPMAP_HINT
GetTextureCompressionHint -> Just gl_TEXTURE_COMPRESSION_HINT
GetPackCMYKHint -> Just gl_PACK_CMYK_HINT
GetUnpackCMYKHint -> Just gl_UNPACK_CMYK_HINT
GetPackCMYKHint -> Just gl_PACK_CMYK_HINT_EXT
GetUnpackCMYKHint -> Just gl_UNPACK_CMYK_HINT_EXT
GetVertexArrayBinding -> Just gl_VERTEX_ARRAY_BINDING
-- Selection ?
GetMaxNameStackDepth -> Just gl_MAX_NAME_STACK_DEPTH
Expand Down Expand Up @@ -635,8 +635,8 @@ instance GetPName PName1I where
GetMaxProjectionStackDepth -> Just gl_MAX_PROJECTION_STACK_DEPTH
GetMaxTextureStackDepth -> Just gl_MAX_TEXTURE_STACK_DEPTH
GetMaxColorMatrixStackDepth -> Just gl_MAX_COLOR_MATRIX_STACK_DEPTH
GetMaxMatrixPaletteStackDepth -> Just gl_MAX_MATRIX_PALETTE_STACK_DEPTH
GetCurrentMatrixStackDepth -> Just gl_CURRENT_MATRIX_STACK_DEPTH
GetMaxMatrixPaletteStackDepth -> Just gl_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB
GetCurrentMatrixStackDepth -> Just gl_CURRENT_MATRIX_STACK_DEPTH_ARB
GetActiveTexture -> Just gl_ACTIVE_TEXTURE
-- vertexarrays
GetVertexArraySize -> Just gl_VERTEX_ARRAY_SIZE
Expand All @@ -658,8 +658,8 @@ instance GetPName PName1I where
GetSecondaryColorArraySize -> Just gl_SECONDARY_COLOR_ARRAY_SIZE
GetSecondaryColorArrayType -> Just gl_SECONDARY_COLOR_ARRAY_TYPE
GetSecondaryColorArrayStride -> Just gl_SECONDARY_COLOR_ARRAY_STRIDE
GetArrayElementLockCount -> Just gl_ARRAY_ELEMENT_LOCK_COUNT
GetArrayElementLockFirst -> Just gl_ARRAY_ELEMENT_LOCK_FIRST
GetArrayElementLockCount -> Just gl_ARRAY_ELEMENT_LOCK_COUNT_EXT
GetArrayElementLockFirst -> Just gl_ARRAY_ELEMENT_LOCK_FIRST_EXT
GetClientActiveTexture -> Just gl_CLIENT_ACTIVE_TEXTURE
GetMaxElementsVertices -> Just gl_MAX_ELEMENTS_VERTICES
GetMaxElementsIndices -> Just gl_MAX_ELEMENTS_INDICES
Expand Down Expand Up @@ -710,7 +710,7 @@ instance GetPName PName1I where
GetFogMode -> Just gl_FOG_MODE
GetFogIndex -> Just gl_FOG_INDEX
GetFogCoordSrc -> Just gl_FOG_COORD_SRC
GetFogDistanceMode -> Just gl_FOG_DISTANCE_MODE
GetFogDistanceMode -> Just gl_FOG_DISTANCE_MODE_NV
-- Framebuffer
GetAuxBuffers -> Just gl_AUX_BUFFERS
GetDoublebuffer -> Just gl_DOUBLEBUFFER
Expand Down Expand Up @@ -753,7 +753,7 @@ instance GetPName PName1I where
GetStencilFail -> Just gl_STENCIL_FAIL
GetStencilPassDepthFail -> Just gl_STENCIL_PASS_DEPTH_FAIL
GetStencilPassDepthPass -> Just gl_STENCIL_PASS_DEPTH_PASS
GetActiveStencilFace -> Just gl_ACTIVE_STENCIL_FACE
GetActiveStencilFace -> Just gl_ACTIVE_STENCIL_FACE_EXT
GetLogicOpMode -> Just gl_LOGIC_OP_MODE
GetBlendDst -> Just gl_BLEND_DST
GetBlendSrc -> Just gl_BLEND_SRC
Expand Down Expand Up @@ -895,8 +895,8 @@ instance GetPName PName1F where
GetZoomX -> Just gl_ZOOM_X
GetZoomY -> Just gl_ZOOM_Y
-- Colors
GetMaxShininess -> Just gl_MAX_SHININESS
GetMaxSpotExponent -> Just gl_MAX_SPOT_EXPONENT
GetMaxShininess -> Just gl_MAX_SHININESS_NV
GetMaxSpotExponent -> Just gl_MAX_SPOT_EXPONENT_NV
-- Fog
GetFogStart -> Just gl_FOG_START
GetFogEnd -> Just gl_FOG_END
Expand Down Expand Up @@ -949,7 +949,7 @@ instance GetPName PName1F where
GetPolygonOffsetFactor -> Just gl_POLYGON_OFFSET_FACTOR
GetPolygonOffsetUnits -> Just gl_POLYGON_OFFSET_UNITS
-- Texture parameters
GetMaxTextureMaxAnisotropy -> Just gl_MAX_TEXTURE_MAX_ANISOTROPY
GetMaxTextureMaxAnisotropy -> Just gl_MAX_TEXTURE_MAX_ANISOTROPY_EXT
GetMaxTextureLODBias -> Just gl_MAX_TEXTURE_LOD_BIAS

-----------------------------------------------------------------------------
Expand Down Expand Up @@ -1037,7 +1037,7 @@ instance GetPName PName2F where
GetAliasedLineWidthRange -> Just gl_ALIASED_LINE_WIDTH_RANGE
GetSmoothLineWidthRange -> Just gl_SMOOTH_LINE_WIDTH_RANGE
-- PerFragment
GetDepthBounds -> Just gl_DEPTH_BOUNDS
GetDepthBounds -> Just gl_DEPTH_BOUNDS_EXT

-----------------------------------------------------------------------------

Expand Down Expand Up @@ -1072,7 +1072,7 @@ instance GetPName PName4I where
-- coordtrans
GetViewport -> Just gl_VIEWPORT
-- Framebuffer
GetRGBASignedComponents -> Just gl_RGBA_SIGNED_COMPONENTS
GetRGBASignedComponents -> Just gl_RGBA_SIGNED_COMPONENTS_EXT
-- PerFragement
GetScissorBox -> Just gl_SCISSOR_BOX

Expand Down Expand Up @@ -1180,4 +1180,4 @@ instance GetPName PNameMatrix where
GetProjectionMatrix -> Just gl_PROJECTION_MATRIX
GetTextureMatrix -> Just gl_TEXTURE_MATRIX
GetColorMatrix -> Just gl_COLOR_MATRIX
GetMatrixPalette -> Just gl_MATRIX_PALETTE
GetMatrixPalette -> Just gl_MATRIX_PALETTE_ARB
2 changes: 1 addition & 1 deletion src/Graphics/Rendering/OpenGL/GL/Shaders/Program.hs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ marshalGetProgramPName x = case x of
TessGenSpacing -> gl_TESS_GEN_SPACING
TessGenVertexOrder -> gl_TESS_GEN_VERTEX_ORDER
TessGenPointMode -> gl_TESS_GEN_POINT_MODE
ComputeWorkGroupSize -> 0x8267 -- gl_COMPUTE_WORK_GROUP_SIZE a.k.a. gl_COMPUTE_LOCAL_WORK_SIZE
ComputeWorkGroupSize -> gl_COMPUTE_WORK_GROUP_SIZE
ProgramSeparable -> gl_PROGRAM_SEPARABLE
ProgramBinaryRetrievableHint -> gl_PROGRAM_BINARY_RETRIEVABLE_HINT
ActiveAtomicCounterBuffers -> gl_ACTIVE_ATOMIC_COUNTER_BUFFERS
Expand Down
Loading

0 comments on commit ceefa7f

Please sign in to comment.