Series Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com>
On Tue, Nov 26, 2013 at 3:54 PM, Ian Romanick <i...@freedesktop.org> wrote: > From: Ian Romanick <ian.d.roman...@intel.com> > > glext.h has had all the necessary bits for years. > > Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> > --- > include/GL/gl.h | 33 --------------------------------- > 1 file changed, 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 > > -- > 1.8.1.4 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev