Skip to content

Commit b874b1e

Browse files
svenpannesvenpanne
committed
Removed temporaray comments.
1 parent 4f9bc7d commit b874b1e

File tree

6 files changed

+6
-305
lines changed

6 files changed

+6
-305
lines changed

‎Graphics/Rendering/OpenGL/GL/Texturing/Application.hs

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,5 @@ import Graphics.Rendering.OpenGL.GL.Texturing.TextureTarget
2323

2424
--------------------------------------------------------------------------------
2525

26-
{-
27-
Allowed targets:
28-
29-
TEXTURE_1D
30-
------------------------------------------------------------------------------
31-
TEXTURE_2D
32-
TEXTURE_1D_ARRAY -- MESA_texture_array only
33-
TEXTURE_RECTANGLE
34-
TEXTURE_CUBE_MAP
35-
------------------------------------------------------------------------------
36-
TEXTURE_3D
37-
TEXTURE_2D_ARRAY -- MESA_texture_array only
38-
39-
In a nutshell: All non-proxy targets, but no
40-
41-
TEXTURE_2D_MULTISAMPLE
42-
TEXTURE_2D_MULTISAMPLE_ARRAY
43-
TEXTURE_CUBE_MAP_ARRAY
44-
45-
although there is no principal reason why these might not be allowed in some
46-
extension in the future.
47-
-}
48-
4926
texture :: ParameterizedTextureTarget t => t -> StateVar Capability
5027
texture = makeCapability . marshalParameterizedTextureTargetEnableCap

‎Graphics/Rendering/OpenGL/GL/Texturing/Objects.hs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,6 @@ import Graphics.Rendering.OpenGL.Raw
3232

3333
--------------------------------------------------------------------------------
3434

35-
{-
36-
Allowed targets:
37-
38-
TEXTURE_1D
39-
------------------------------------------------------------------------------
40-
TEXTURE_2D
41-
TEXTURE_2D_MULTISAMPLE
42-
TEXTURE_1D_ARRAY
43-
TEXTURE_RECTANGLE
44-
TEXTURE_CUBE_MAP
45-
------------------------------------------------------------------------------
46-
TEXTURE_3D
47-
TEXTURE_2D_ARRAY
48-
TEXTURE_2D_MULTISAMPLE_ARRAY
49-
TEXTURE_CUBE_MAP_ARRAY
50-
------------------------------------------------------------------------------
51-
TEXTURE_BUFFER
52-
53-
In a nutshell: All non-proxy targets are allowed plus TEXTURE_BUFFER.
54-
-}
55-
5635
textureBinding :: BindableTextureTarget t => t -> StateVar (Maybe TextureObject)
5736
textureBinding t =
5837
makeStateVar

‎Graphics/Rendering/OpenGL/GL/Texturing/Queries.hs

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -152,36 +152,6 @@ textureProxyOK t level =
152152
makeGettableStateVar $
153153
getTexLevelParameteriProxy unmarshalGLboolean t level TextureWidth
154154

155-
{-
156-
Allowed targets:
157-
158-
TEXTURE_1D PROXY_TEXTURE_1D
159-
------------------------------------------------------------------------------
160-
TEXTURE_2D PROXY_TEXTURE_2D
161-
TEXTURE_2D_MULTISAMPLE PROXY_TEXTURE_2D_MULTISAMPLE
162-
TEXTURE_1D_ARRAY PROXY_TEXTURE_1D_ARRAY
163-
TEXTURE_RECTANGLE PROXY_TEXTURE_RECTANGLE
164-
PROXY_TEXTURE_CUBE_MAP
165-
TEXTURE_CUBE_MAP_POSITIVE_X
166-
TEXTURE_CUBE_MAP_NEGATIVE_X
167-
TEXTURE_CUBE_MAP_POSITIVE_Y
168-
TEXTURE_CUBE_MAP_NEGATIVE_Y
169-
TEXTURE_CUBE_MAP_POSITIVE_Z
170-
TEXTURE_CUBE_MAP_NEGATIVE_Z
171-
------------------------------------------------------------------------------
172-
TEXTURE_3D PROXY_TEXTURE_3D
173-
TEXTURE_2D_ARRAY PROXY_TEXTURE_2D_ARRAY
174-
TEXTURE_2D_MULTISAMPLE_ARRAY PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY
175-
TEXTURE_CUBE_MAP_ARRAY PROXY_TEXTURE_CUBE_MAP_ARRAY
176-
177-
In a nutshell: Basically all targets are allowed, only cube maps are special:
178-
For non-proxy targets one has to specify the exact face of a cube map, for
179-
proxy targets only the whole cube map is interesting.
180-
181-
Note that proxy targets are only interesting when specifiying textures via
182-
gl[Compressed]TexImage{123}D and when querying the width via
183-
glGetTexLevelParameteriv.
184-
-}
185155
getTexLevelParameteriProxy :: ParameterizedTextureTarget t => (GLint -> a) -> t -> Level -> TexLevelParameter -> IO a
186156
getTexLevelParameteriProxy f t level p = getTexLevelParameteri f (marshalParameterizedTextureTargetProxy t) level p
187157

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

Lines changed: 3 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,6 @@ data TextureSize3D = TextureSize3D !GLsizei !GLsizei !GLsizei
110110

111111
--------------------------------------------------------------------------------
112112

113-
{-
114-
Allowed targets:
115-
116-
TEXTURE_1D
117-
PROXY_TEXTURE_1D
118-
-}
119-
120113
texImage1D :: OneDimensionalTextureTarget t => t -> Proxy -> Level -> PixelInternalFormat -> TextureSize1D -> Border -> PixelData a -> IO ()
121114
texImage1D target proxy level int (TextureSize1D w) border pd =
122115
withPixelData pd $
@@ -125,26 +118,6 @@ texImage1D target proxy level int (TextureSize1D w) border pd =
125118
level (marshalPixelInternalFormat int) w border
126119

127120
--------------------------------------------------------------------------------
128-
{-
129-
Allowed targets:
130-
131-
TEXTURE_2D
132-
TEXTURE_1D_ARRAY
133-
TEXTURE_RECTANGLE
134-
TEXTURE_CUBE_MAP_POSITIVE_X
135-
TEXTURE_CUBE_MAP_NEGATIVE_X
136-
TEXTURE_CUBE_MAP_POSITIVE_Y
137-
TEXTURE_CUBE_MAP_NEGATIVE_Y
138-
TEXTURE_CUBE_MAP_POSITIVE_Z
139-
TEXTURE_CUBE_MAP_NEGATIVE_Z
140-
PROXY_TEXTURE_2D
141-
PROXY_TEXTURE_1D_ARRAY
142-
PROXY_TEXTURE_RECTANGLE
143-
PROXY_TEXTURE_CUBE_MAP
144-
145-
Note: No TEXTURE_2D_MULTISAMPLE or PROXY_TEXTURE_2D_MULTISAMPLE targets! For
146-
these use glTexImage2DMultisample.
147-
-}
148121

149122
texImage2D :: TwoDimensionalTextureTarget t => t -> Proxy -> Level -> PixelInternalFormat -> TextureSize2D -> Border -> PixelData a -> IO ()
150123
texImage2D target proxy level int (TextureSize2D w h) border pd =
@@ -153,20 +126,6 @@ texImage2D target proxy level int (TextureSize2D w h) border pd =
153126

154127
--------------------------------------------------------------------------------
155128

156-
{-
157-
Allowed targets:
158-
159-
TEXTURE_3D
160-
TEXTURE_2D_ARRAY
161-
TEXTURE_CUBE_MAP_ARRAY
162-
PROXY_TEXTURE_3D
163-
PROXY_TEXTURE_2D_ARRAY
164-
PROXY_TEXTURE_CUBE_MAP_ARRAY
165-
166-
Note: No TEXTURE_2D_MULTISAMPLE_ARRAY or PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY
167-
targets! For these use glTexImage3DMultisample.
168-
-}
169-
170129
texImage3D :: ThreeDimensionalTextureTarget t => t -> Proxy -> Level -> PixelInternalFormat -> TextureSize3D -> Border -> PixelData a -> IO ()
171130
texImage3D target proxy level int (TextureSize3D w h d) border pd =
172131
withPixelData pd $
@@ -176,34 +135,13 @@ texImage3D target proxy level int (TextureSize3D w h d) border pd =
176135

177136
--------------------------------------------------------------------------------
178137

179-
{-
180-
Allowed targets:
181-
182-
TEXTURE_1D
183-
------------------------------------------------------------------------------
184-
TEXTURE_2D
185-
TEXTURE_1D_ARRAY
186-
TEXTURE_RECTANGLE
187-
TEXTURE_CUBE_MAP_POSITIVE_X
188-
TEXTURE_CUBE_MAP_NEGATIVE_X
189-
TEXTURE_CUBE_MAP_POSITIVE_Y
190-
TEXTURE_CUBE_MAP_NEGATIVE_Y
191-
TEXTURE_CUBE_MAP_POSITIVE_Z
192-
TEXTURE_CUBE_MAP_NEGATIVE_Z
193-
------------------------------------------------------------------------------
194-
TEXTURE_3D
195-
TEXTURE_2D_ARRAY
196-
TEXTURE_CUBE_MAP_ARRAY
197-
-}
198-
199138
getTexImage :: GettableTextureTarget t => t -> Level -> PixelData a -> IO ()
200139
getTexImage target level pd =
201140
withPixelData pd $
202141
glGetTexImage (marshalGettableTextureTarget target) level
203142

204143
--------------------------------------------------------------------------------
205144

206-
-- see texImage1D, but no proxies
207145
copyTexImage1D :: OneDimensionalTextureTarget t => t -> Level -> PixelInternalFormat -> Position -> TextureSize1D -> Border -> IO ()
208146
copyTexImage1D target level int (Position x y) (TextureSize1D w) border =
209147
glCopyTexImage1D
@@ -212,7 +150,6 @@ copyTexImage1D target level int (Position x y) (TextureSize1D w) border =
212150

213151
--------------------------------------------------------------------------------
214152

215-
-- see texImage2D, but no proxies
216153
copyTexImage2D :: TwoDimensionalTextureTarget t => t -> Level -> PixelInternalFormat -> Position -> TextureSize2D -> Border -> IO ()
217154
copyTexImage2D target level int (Position x y) (TextureSize2D w h) border =
218155
glCopyTexImage2D
@@ -221,45 +158,39 @@ copyTexImage2D target level int (Position x y) (TextureSize2D w h) border =
221158

222159
--------------------------------------------------------------------------------
223160

224-
-- see texImage1D, but no proxies
225161
texSubImage1D :: OneDimensionalTextureTarget t => t -> Level -> TexturePosition1D -> TextureSize1D -> PixelData a -> IO ()
226162
texSubImage1D target level (TexturePosition1D xOff) (TextureSize1D w) pd =
227163
withPixelData pd $
228164
glTexSubImage1D (marshalOneDimensionalTextureTarget NoProxy target) level xOff w
229165

230166
--------------------------------------------------------------------------------
231167

232-
-- see texImage2D, but no proxies
233168
texSubImage2D :: TwoDimensionalTextureTarget t => t -> Level -> TexturePosition2D -> TextureSize2D -> PixelData a -> IO ()
234169
texSubImage2D target level (TexturePosition2D xOff yOff) (TextureSize2D w h) pd =
235170
withPixelData pd $
236171
glTexSubImage2D (marshalTwoDimensionalTextureTarget NoProxy target) level xOff yOff w h
237172

238173
--------------------------------------------------------------------------------
239174

240-
-- see texImage3D, but no proxies
241175
texSubImage3D :: ThreeDimensionalTextureTarget t => t -> Level -> TexturePosition3D -> TextureSize3D -> PixelData a -> IO ()
242176
texSubImage3D target level (TexturePosition3D xOff yOff zOff) (TextureSize3D w h d) pd =
243177
withPixelData pd $
244178
glTexSubImage3D (marshalThreeDimensionalTextureTarget NoProxy target) level xOff yOff zOff w h d
245179

246180
--------------------------------------------------------------------------------
247181

248-
-- see texImage1D, but no proxies
249182
copyTexSubImage1D :: OneDimensionalTextureTarget t => t -> Level -> TexturePosition1D -> Position -> TextureSize1D -> IO ()
250183
copyTexSubImage1D target level (TexturePosition1D xOff) (Position x y) (TextureSize1D w) =
251184
glCopyTexSubImage1D (marshalOneDimensionalTextureTarget NoProxy target) level xOff x y w
252185

253186
--------------------------------------------------------------------------------
254187

255-
-- see texImage2D, but no proxies
256188
copyTexSubImage2D :: TwoDimensionalTextureTarget t => t -> Level -> TexturePosition2D -> Position -> TextureSize2D -> IO ()
257189
copyTexSubImage2D target level (TexturePosition2D xOff yOff) (Position x y) (TextureSize2D w h) =
258190
glCopyTexSubImage2D (marshalTwoDimensionalTextureTarget NoProxy target) level xOff yOff x y w h
259191

260192
--------------------------------------------------------------------------------
261193

262-
-- see texImage3D, but no proxies
263194
copyTexSubImage3D :: ThreeDimensionalTextureTarget t => t -> Level -> TexturePosition3D -> Position -> TextureSize2D -> IO ()
264195
copyTexSubImage3D target level (TexturePosition3D xOff yOff zOff) (Position x y) (TextureSize2D w h) =
265196
glCopyTexSubImage3D (marshalThreeDimensionalTextureTarget NoProxy target) level xOff yOff zOff x y w h
@@ -289,7 +220,6 @@ withCompressedPixelData
289220

290221
--------------------------------------------------------------------------------
291222

292-
-- see texImage1D
293223
compressedTexImage1D :: OneDimensionalTextureTarget t => t -> Proxy -> Level -> TextureSize1D -> Border -> CompressedPixelData a -> IO ()
294224
compressedTexImage1D target proxy level (TextureSize1D w) border cpd =
295225
withCompressedPixelData cpd $ \fmt ->
@@ -298,16 +228,15 @@ compressedTexImage1D target proxy level (TextureSize1D w) border cpd =
298228

299229
--------------------------------------------------------------------------------
300230

301-
-- see texImage2D, but note that the spec currently disallows TextureRectangle,
302-
-- but then again the extension explicitly allows a relaxation in the future.
231+
-- Note that the spec currently disallows TextureRectangle, but then again the
232+
-- extension specification explicitly allows a relaxation in the future.
303233
compressedTexImage2D :: TwoDimensionalTextureTarget t => t -> Proxy -> Level -> TextureSize2D -> Border -> CompressedPixelData a -> IO ()
304234
compressedTexImage2D target proxy level (TextureSize2D w h) border cpd =
305235
withCompressedPixelData cpd $ \fmt ->
306236
glCompressedTexImage2D (marshalTwoDimensionalTextureTarget proxy target) level fmt w h border
307237

308238
--------------------------------------------------------------------------------
309239

310-
-- see texImage3D
311240
compressedTexImage3D :: ThreeDimensionalTextureTarget t => t -> Proxy -> Level -> TextureSize3D -> Border -> CompressedPixelData a -> IO ()
312241
compressedTexImage3D target proxy level (TextureSize3D w h d) border cpd =
313242
withCompressedPixelData cpd $ \fmt ->
@@ -321,15 +250,13 @@ getCompressedTexImage = glGetCompressedTexImage . marshalGettableTextureTarget
321250

322251
--------------------------------------------------------------------------------
323252

324-
-- see texImage1D, but no proxies
325253
compressedTexSubImage1D :: OneDimensionalTextureTarget t => t -> Level -> TexturePosition1D -> TextureSize1D -> CompressedPixelData a -> IO ()
326254
compressedTexSubImage1D target level (TexturePosition1D xOff) (TextureSize1D w) cpd =
327255
withCompressedPixelData cpd $
328256
glCompressedTexSubImage1D (marshalOneDimensionalTextureTarget NoProxy target) level xOff w
329257

330258
--------------------------------------------------------------------------------
331259

332-
-- see texImage2D, but no proxies
333260
compressedTexSubImage2D :: TwoDimensionalTextureTarget t => t -> Level -> TexturePosition2D -> TextureSize2D -> CompressedPixelData a -> IO ()
334261
compressedTexSubImage2D target level (TexturePosition2D xOff yOff) (TextureSize2D w h) cpd =
335262
withCompressedPixelData cpd $
@@ -393,6 +320,7 @@ texImage3DMultisample target proxy (Samples s) int (TextureSize3D w h d) loc =
393320
w h d (marshalSampleLocations loc)
394321

395322
--------------------------------------------------------------------------------
323+
396324
maxTextureSize :: GettableStateVar GLsizei
397325
maxTextureSize = maxTextureSizeWith GetMaxTextureSize
398326

‎Graphics/Rendering/OpenGL/GL/Texturing/TexParameter.hs

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -78,25 +78,6 @@ marshalTexParameter x = case x of
7878

7979
--------------------------------------------------------------------------------
8080

81-
{-
82-
Allowed targets:
83-
84-
TEXTURE_1D
85-
------------------------------------------------------------------------------
86-
TEXTURE_2D
87-
TEXTURE_2D_MULTISAMPLE
88-
TEXTURE_1D_ARRAY
89-
TEXTURE_RECTANGLE
90-
TEXTURE_CUBE_MAP
91-
------------------------------------------------------------------------------
92-
TEXTURE_3D
93-
TEXTURE_2D_ARRAY
94-
TEXTURE_2D_MULTISAMPLE_ARRAY
95-
TEXTURE_CUBE_MAP_ARRAY
96-
97-
In a nutshell: All non-proxy targets are allowed.
98-
-}
99-
10081
texParameter :: ParameterizedTextureTarget t
10182
=> (GLenum -> GLenum -> b -> IO ())
10283
-> (a -> (b -> IO ()) -> IO ())
@@ -107,25 +88,6 @@ texParameter glTexParameter marshalAct t p x =
10788

10889
--------------------------------------------------------------------------------
10990

110-
{-
111-
Allowed targets:
112-
113-
TEXTURE_1D
114-
------------------------------------------------------------------------------
115-
TEXTURE_2D
116-
TEXTURE_2D_MULTISAMPLE
117-
TEXTURE_1D_ARRAY
118-
TEXTURE_RECTANGLE
119-
TEXTURE_CUBE_MAP
120-
------------------------------------------------------------------------------
121-
TEXTURE_3D
122-
TEXTURE_2D_ARRAY
123-
TEXTURE_2D_MULTISAMPLE_ARRAY
124-
TEXTURE_CUBE_MAP_ARRAY
125-
126-
In a nutshell: All non-proxy targets are allowed.
127-
-}
128-
12991
getTexParameter :: (Storable b, ParameterizedTextureTarget t)
13092
=> (GLenum -> GLenum -> Ptr b -> IO ())
13193
-> (b -> a)

0 commit comments

Comments
 (0)