diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2013-11-20 13:52:18 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-12-04 17:22:43 -0800 |
| commit | fa1923ac3afe47b225bcc9c83211ae99366d5948 (patch) | |
| tree | f934f304bd8bc3f2c64e5ebc0528e73b323affa5 /include/GL | |
| parent | 2a3d1e2e06ce74801ccbfd349558d44653b9692f (diff) | |
| download | external_mesa3d-fa1923ac3afe47b225bcc9c83211ae99366d5948.zip external_mesa3d-fa1923ac3afe47b225bcc9c83211ae99366d5948.tar.gz external_mesa3d-fa1923ac3afe47b225bcc9c83211ae99366d5948.tar.bz2 | |
mesa: Remove GL_MESA_texture_array cruft from gl.h
glext.h has had all the necessary bits for years.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'include/GL')
| -rw-r--r-- | include/GL/gl.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h index b484b96..48343f6 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -2078,39 +2078,6 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLsh #endif /* GL_MESA_packed_depth_stencil */ -#ifndef GL_MESA_texture_array -#define GL_MESA_texture_array 1 - -/* GL_MESA_texture_array uses the same enum values as GL_EXT_texture_array. - */ -#ifndef GL_EXT_texture_array - -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFramebufferTextureLayerEXT(GLenum target, - GLenum attachment, GLuint texture, GLint level, GLint layer); -#endif /* GL_GLEXT_PROTOTYPES */ - -#if 0 -/* (temporarily) disabled because of collision with typedef in glext.h - * that happens if apps include both gl.h and glext.h - */ -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, - GLenum attachment, GLuint texture, GLint level, GLint layer); -#endif - -#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18 -#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19 -#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A -#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B -#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C -#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D -#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4 -#endif - -#endif - - #ifndef GL_ATI_blend_equation_separate #define GL_ATI_blend_equation_separate 1 |