Skip to content

Commit ceefa7f

Browse files
svenpannesvenpanne
committed
Synched with latest raw API.
1 parent ddc9909 commit ceefa7f

File tree

18 files changed

+92
-107
lines changed

18 files changed

+92
-107
lines changed

‎OpenGL.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: OpenGL
2-
version: 2.10.0.1
2+
version: 2.10.0.2
33
synopsis: A binding for the OpenGL graphics system
44
description:
55
A Haskell binding for the OpenGL graphics system (GL, version 4.4) and its
@@ -146,7 +146,7 @@ library
146146
hs-source-dirs: src
147147
ghc-options: -Wall -O2
148148
build-depends:
149-
base >= 3 && < 5, bytestring, text, OpenGLRaw >= 1.4.1.0, GLURaw >= 1.3.0.0
149+
base >= 3 && < 5, bytestring, text, OpenGLRaw >= 2.1, GLURaw >= 1.3.0.0
150150
default-language: Haskell2010
151151
other-extensions:
152152
CPP

‎src/Graphics/Rendering/OpenGL/GL/BeginEnd.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ renderPrim brack_ beginMode =
104104
--------------------------------------------------------------------------------
105105

106106
primitiveRestart :: IO ()
107-
primitiveRestart = glPrimitiveRestart
107+
primitiveRestart = glPrimitiveRestartNV
108108

109109
--------------------------------------------------------------------------------
110110

‎src/Graphics/Rendering/OpenGL/GL/Capability.hs‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,14 @@ marshalEnableCap x = case x of
206206
CapEdgeFlagArray -> Just gl_EDGE_FLAG_ARRAY
207207
CapFogCoordArray -> Just gl_FOG_COORD_ARRAY
208208
CapSecondaryColorArray -> Just gl_SECONDARY_COLOR_ARRAY
209-
CapMatrixIndexArray -> Just gl_MATRIX_INDEX_ARRAY
209+
CapMatrixIndexArray -> Just gl_MATRIX_INDEX_ARRAY_ARB
210210
CapConvolution1D -> Just gl_CONVOLUTION_1D
211211
CapConvolution2D -> Just gl_CONVOLUTION_2D
212212
CapSeparable2D -> Just gl_SEPARABLE_2D
213213
CapHistogram -> Just gl_HISTOGRAM
214214
CapMinmax -> Just gl_MINMAX
215215
CapRescaleNormal -> Just gl_RESCALE_NORMAL
216-
CapSharedTexturePalette -> Just gl_SHARED_TEXTURE_PALETTE
216+
CapSharedTexturePalette -> Just gl_SHARED_TEXTURE_PALETTE_EXT
217217
CapMultisample -> Just gl_MULTISAMPLE
218218
CapSampleAlphaToCoverage -> Just gl_SAMPLE_ALPHA_TO_COVERAGE
219219
CapSampleAlphaToOne -> Just gl_SAMPLE_ALPHA_TO_ONE
@@ -222,20 +222,18 @@ marshalEnableCap x = case x of
222222
CapPostConvolutionColorTable -> Just gl_POST_CONVOLUTION_COLOR_TABLE
223223
CapPostColorMatrixColorTable -> Just gl_POST_COLOR_MATRIX_COLOR_TABLE
224224
CapColorSum -> Just gl_COLOR_SUM
225-
CapWeightSumUnity -> Just gl_WEIGHT_SUM_UNITY
226-
CapVertexBlend -> Just gl_VERTEX_BLEND
227-
CapWeightArray -> Just gl_WEIGHT_ARRAY
228-
CapMatrixPalette -> Just gl_MATRIX_PALETTE
225+
CapWeightSumUnity -> Just gl_WEIGHT_SUM_UNITY_ARB
226+
CapVertexBlend -> Just gl_VERTEX_BLEND_ARB
227+
CapWeightArray -> Just gl_WEIGHT_ARRAY_ARB
228+
CapMatrixPalette -> Just gl_MATRIX_PALETTE_ARB
229229
CapDepthClamp -> Just gl_DEPTH_CLAMP
230-
CapDepthBoundsTest -> Just gl_DEPTH_BOUNDS_TEST
230+
CapDepthBoundsTest -> Just gl_DEPTH_BOUNDS_TEST_EXT
231231
CapPrimitiveRestart -> Just gl_PRIMITIVE_RESTART
232232
CapPointSprite -> Just gl_POINT_SPRITE
233-
CapStencilTestTwoSide -> Just gl_STENCIL_TEST_TWO_SIDE
234-
-- TODO: use RASTER_POSITION_UNCLIPPED_IBM from IBM_rasterpos_clip extension
235-
CapRasterPositionUnclipped -> Just 0x19262
233+
CapStencilTestTwoSide -> Just gl_STENCIL_TEST_TWO_SIDE_EXT
234+
CapRasterPositionUnclipped -> Just gl_RASTER_POSITION_UNCLIPPED_IBM
236235
CapRasterizerDiscard -> Just gl_RASTERIZER_DISCARD
237-
-- TODO: use TEXTURE_COLOR_TABLE_SGI from SGI_texture_color_table extension
238-
CapTextureColorTable -> Just 0x80bc
236+
CapTextureColorTable -> Just gl_TEXTURE_COLOR_TABLE_SGI
239237
CapVertexProgramPointSize -> Just gl_VERTEX_PROGRAM_POINT_SIZE
240238
CapVertexProgramTwoSide -> Just gl_VERTEX_PROGRAM_TWO_SIDE
241239

‎src/Graphics/Rendering/OpenGL/GL/CoordTrans.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,14 @@ marshalMatrixMode x = case x of
126126
Projection -> Just gl_PROJECTION
127127
Texture -> Just gl_TEXTURE
128128
Color -> Just gl_COLOR
129-
MatrixPalette -> Just gl_MATRIX_PALETTE
129+
MatrixPalette -> Just gl_MATRIX_PALETTE_ARB
130130

131131
unmarshalMatrixMode :: GLenum -> MatrixMode
132132
unmarshalMatrixMode x
133133
| x == gl_PROJECTION = Projection
134134
| x == gl_TEXTURE = Texture
135135
| x == gl_COLOR = Color
136-
| x == gl_MATRIX_PALETTE = MatrixPalette
136+
| x == gl_MATRIX_PALETTE_ARB = MatrixPalette
137137
| otherwise =
138138
case modelviewEnumToIndex x of
139139
Just i -> Modelview i

‎src/Graphics/Rendering/OpenGL/GL/DataType.hs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,8 @@ marshalDataType x = case x of
8484
UnsignedInt5999Rev -> gl_UNSIGNED_INT_5_9_9_9_REV
8585
Float32UnsignedInt248Rev -> gl_FLOAT_32_UNSIGNED_INT_24_8_REV
8686
Bitmap -> gl_BITMAP
87-
-- TODO: Use UNSIGNED_SHORT_8_8_APPLE from APPLE_ycbcr_422 extension
88-
UnsignedShort88 -> 0x85ba
89-
-- TODO: Use UNSIGNED_SHORT_8_8_REV_APPLE from APPLE_ycbcr_422 extension
90-
UnsignedShort88Rev -> 0x85bb
87+
UnsignedShort88 -> gl_UNSIGNED_SHORT_8_8_APPLE
88+
UnsignedShort88Rev -> gl_UNSIGNED_SHORT_8_8_REV_APPLE
9189
Double -> gl_DOUBLE
9290
TwoBytes -> gl_2_BYTES
9391
ThreeBytes -> gl_3_BYTES
@@ -120,10 +118,8 @@ unmarshalDataType x
120118
| x == gl_UNSIGNED_INT_5_9_9_9_REV = UnsignedInt5999Rev
121119
| x == gl_FLOAT_32_UNSIGNED_INT_24_8_REV = Float32UnsignedInt248Rev
122120
| x == gl_BITMAP = Bitmap
123-
-- TODO: Use UNSIGNED_SHORT_8_8_APPLE from APPLE_ycbcr_422 extension
124-
| x == 0x85ba = UnsignedShort88
125-
-- TODO: Use UNSIGNED_SHORT_8_8_REV_APPLE from APPLE_ycbcr_422 extension
126-
| x == 0x85bb = UnsignedShort88Rev
121+
| x == gl_UNSIGNED_SHORT_8_8_APPLE = UnsignedShort88
122+
| x == gl_UNSIGNED_SHORT_8_8_REV_APPLE = UnsignedShort88Rev
127123
| x == gl_DOUBLE = Double
128124
| x == gl_2_BYTES = TwoBytes
129125
| x == gl_3_BYTES = ThreeBytes

‎src/Graphics/Rendering/OpenGL/GL/Fog.hs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ marshalFogParameter x = case x of
5454
FogMode -> gl_FOG_MODE
5555
FogColor -> gl_FOG_COLOR
5656
FogCoordSrc -> gl_FOG_COORD_SRC
57-
-- TODO: Use FOG_DISTANCE_MODE_NV from NV_fog_distance extension
58-
FogDistanceMode -> 0x855a
57+
FogDistanceMode -> gl_FOG_DISTANCE_MODE_NV
5958

6059
--------------------------------------------------------------------------------
6160

@@ -178,19 +177,15 @@ data FogDistanceMode =
178177

179178
marshalFogDistanceMode :: FogDistanceMode -> GLint
180179
marshalFogDistanceMode x = fromIntegral $ case x of
181-
-- TODO: Use EYE_RADIAL_NV from NV_fog_distance extension
182-
EyeRadial -> 0x855b
180+
EyeRadial -> gl_EYE_RADIAL_NV
183181
EyePlaneSigned ->gl_EYE_PLANE
184-
-- TODO: Use EYE_PLANE_ABSOLUTE_NV from NV_fog_distance extension
185-
EyePlaneAbsolute -> 0x855c
182+
EyePlaneAbsolute -> gl_EYE_PLANE_ABSOLUTE_NV
186183

187184
unmarshalFogDistanceMode :: GLint -> FogDistanceMode
188185
unmarshalFogDistanceMode x
189-
-- TODO: Use EYE_RADIAL_NV from NV_fog_distance extension
190-
| y == 0x855b = EyeRadial
186+
| y == gl_EYE_RADIAL_NV = EyeRadial
191187
| y == gl_EYE_PLANE = EyePlaneSigned
192-
-- TODO: Use EYE_PLANE_ABSOLUTE_NV from NV_fog_distance extension
193-
| y == 0x855c = EyePlaneAbsolute
188+
| y == gl_EYE_PLANE_ABSOLUTE_NV = EyePlaneAbsolute
194189
| otherwise = error ("unmarshalFogDistanceMode: illegal value " ++ show x)
195190
where y = fromIntegral x
196191

‎src/Graphics/Rendering/OpenGL/GL/Hints.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ marshalHintTarget x = case x of
4343
Fog -> gl_FOG_HINT
4444
GenerateMipmap -> gl_GENERATE_MIPMAP_HINT
4545
TextureCompression -> gl_TEXTURE_COMPRESSION_HINT
46-
PackCMYK -> gl_PACK_CMYK_HINT
47-
UnpackCMYK -> gl_UNPACK_CMYK_HINT
46+
PackCMYK -> gl_PACK_CMYK_HINT_EXT
47+
UnpackCMYK -> gl_UNPACK_CMYK_HINT_EXT
4848

4949
hintTargetToGetPName :: HintTarget -> PName1I
5050
hintTargetToGetPName x = case x of

‎src/Graphics/Rendering/OpenGL/GL/PerFragment.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ depthBounds =
104104
makeStateVarMaybe
105105
(return CapDepthBoundsTest)
106106
(getClampd2 (,) GetDepthBounds)
107-
(uncurry glDepthBounds)
107+
(uncurry glDepthBoundsEXT)
108108

109109
--------------------------------------------------------------------------------
110110

@@ -200,7 +200,7 @@ activeStencilFace =
200200
makeStateVarMaybe
201201
(return CapStencilTestTwoSide)
202202
(getEnum1 unmarshalFace GetActiveStencilFace)
203-
(glActiveStencilFace . marshalFace)
203+
(glActiveStencilFaceEXT . marshalFace)
204204

205205
--------------------------------------------------------------------------------
206206

‎src/Graphics/Rendering/OpenGL/GL/PixelFormat.hs‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,16 @@ marshalPixelFormat x = case x of
7979
RGBAInteger -> gl_RGBA_INTEGER
8080
BGRInteger -> gl_BGR_INTEGER
8181
BGRAInteger -> gl_BGRA_INTEGER
82-
ABGR -> gl_ABGR
82+
ABGR -> gl_ABGR_EXT
8383
BGR -> gl_BGR
8484
BGRA -> gl_BGRA
85-
CMYK -> gl_CMYK
86-
CMYKA -> gl_CMYKA
87-
FourTwoTwo -> gl_422
88-
FourTwoTwoRev -> gl_422_REV
89-
FourTwoTwoAverage -> gl_422_AVERAGE
90-
FourTwoTwoRevAverage -> gl_422_REV_AVERAGE
91-
-- TODO: Use YCBCR_422_APPLE from APPLE_ycbcr_422 extension
92-
YCBCR422 -> 0x85B9
85+
CMYK -> gl_CMYK_EXT
86+
CMYKA -> gl_CMYKA_EXT
87+
FourTwoTwo -> gl_422_EXT
88+
FourTwoTwoRev -> gl_422_REV_EXT
89+
FourTwoTwoAverage -> gl_422_AVERAGE_EXT
90+
FourTwoTwoRevAverage -> gl_422_REV_AVERAGE_EXT
91+
YCBCR422 -> gl_YCBCR_422_APPLE
9392
DepthStencil -> gl_DEPTH_STENCIL
9493

9594
unmarshalPixelFormat :: GLenum -> PixelFormat
@@ -115,16 +114,15 @@ unmarshalPixelFormat x
115114
| x == gl_RGBA_INTEGER = RGBAInteger
116115
| x == gl_BGR_INTEGER = BGRInteger
117116
| x == gl_BGRA_INTEGER = BGRAInteger
118-
| x == gl_ABGR = ABGR
117+
| x == gl_ABGR_EXT = ABGR
119118
| x == gl_BGR = BGR
120119
| x == gl_BGRA = BGRA
121-
| x == gl_CMYK = CMYK
122-
| x == gl_CMYKA = CMYKA
123-
| x == gl_422 = FourTwoTwo
124-
| x == gl_422_REV = FourTwoTwoRev
125-
| x == gl_422_AVERAGE = FourTwoTwoAverage
126-
| x == gl_422_REV_AVERAGE = FourTwoTwoRevAverage
127-
-- TODO: Use YCBCR_422_APPLE from APPLE_ycbcr_422 extension
128-
| x == 0x85B9 = YCBCR422
120+
| x == gl_CMYK_EXT = CMYK
121+
| x == gl_CMYKA_EXT = CMYKA
122+
| x == gl_422_EXT = FourTwoTwo
123+
| x == gl_422_REV_EXT = FourTwoTwoRev
124+
| x == gl_422_AVERAGE_EXT = FourTwoTwoAverage
125+
| x == gl_422_REV_AVERAGE_EXT = FourTwoTwoRevAverage
126+
| x == gl_YCBCR_422_APPLE = YCBCR422
129127
| x == gl_DEPTH_STENCIL = DepthStencil
130128
| otherwise = error ("unmarshalPixelFormat: illegal value " ++ show x)

‎src/Graphics/Rendering/OpenGL/GL/PixelRectangles/ColorTable.hs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,8 @@ marshalColorTable x = case x of
8686
Texture2DColorTable -> gl_TEXTURE_2D
8787
Texture3DColorTable -> gl_TEXTURE_3D
8888
TextureCubeMapColorTable -> gl_TEXTURE_CUBE_MAP
89-
-- TODO: Use TEXTURE_COLOR_TABLE_SGI from SGI_texture_color_table extension
90-
TextureColorTable -> 0x80bc
91-
SharedTexturePalette -> gl_SHARED_TEXTURE_PALETTE
89+
TextureColorTable -> gl_TEXTURE_COLOR_TABLE_SGI
90+
SharedTexturePalette -> gl_SHARED_TEXTURE_PALETTE_EXT
9291

9392
--------------------------------------------------------------------------------
9493

@@ -109,8 +108,7 @@ marshalProxyColorTable Proxy x = case x of
109108
Texture2DColorTable -> Just gl_PROXY_TEXTURE_2D
110109
Texture3DColorTable -> Just gl_PROXY_TEXTURE_3D
111110
TextureCubeMapColorTable -> Just gl_PROXY_TEXTURE_CUBE_MAP
112-
-- TODO: Use PROXY_TEXTURE_COLOR_TABLE_SGI from SGI_texture_color_table extension
113-
TextureColorTable -> Just 0x80bd
111+
TextureColorTable -> Just gl_TEXTURE_COLOR_TABLE_SGI
114112
SharedTexturePalette -> Nothing
115113

116114
--------------------------------------------------------------------------------

0 commit comments

Comments
 (0)