diff options
| author | Brian <[email protected]> | 2007-05-17 08:54:08 -0600 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-05-17 08:54:08 -0600 |
| commit | 6ee6b2dcd96fafae8d924d617e54e32a2aa8c5ea (patch) | |
| tree | d86c7fb972f381e9b3263b14c1bf5136289f0a0a /include | |
| parent | 347bb541f5a89f59e502888a5ae486bc52abfb66 (diff) | |
| parent | 67f82731fcb87f789135e07f691d41ebd12f0015 (diff) | |
Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/gl.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h index 78a00aeb8b3..6e92481a536 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -2209,6 +2209,34 @@ GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, con #endif /* GL_MESA_program_debug */ +#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 */ + +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, + GLenum attachment, GLuint texture, GLint level, GLint layer); + +#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 |