diff options
| author | Emil Velikov <[email protected]> | 2018-09-05 17:35:17 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-10-03 13:38:06 +0100 |
| commit | 91ff8b1dd9bb5fe605d30e61dc4d8b69e391c0c8 (patch) | |
| tree | aa09cfba68213da9030f6911bb32e34c778c2d67 | |
| parent | 5f70964b1d7cc34b98a8e8d23018d7890a8cad54 (diff) | |
mesa: reorder and document the tokens in glheader.h
Split into different sections, document each one as well as strange
cases like GL_ATI_texture_compression_3dc.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | src/mesa/main/glheader.h | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index b1f19e44008..e95fc9fb4fe 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -49,7 +49,7 @@ typedef unsigned char GLbitfield8; typedef unsigned short GLbitfield16; typedef GLuint64 GLbitfield64; -typedef int GLclampx; +/* Common GLES 1.0 and 2.0 tokens */ #ifndef GL_OES_EGL_image_external #define GL_TEXTURE_EXTERNAL_OES 0x8D65 @@ -58,6 +58,15 @@ typedef int GLclampx; #define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68 #endif +#ifndef GL_OES_compressed_ETC1_RGB8_texture +#define GL_ETC1_RGB8_OES 0x8D64 +#endif + + +/* GLES 1.0 only tokens */ + +typedef int GLclampx; + #ifndef GL_OES_point_size_array #define GL_POINT_SIZE_ARRAY_OES 0x8B9C #define GL_POINT_SIZE_ARRAY_TYPE_OES 0x898A @@ -71,15 +80,15 @@ typedef int GLclampx; #define GL_TEXTURE_CROP_RECT_OES 0x8B9D #endif - -#ifndef GL_PROGRAM_BINARY_LENGTH_OES -#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741 +#ifndef GL_TEXTURE_GEN_STR_OES +#define GL_TEXTURE_GEN_STR_OES 0x8D60 #endif -/* GLES 2.0 tokens */ -#ifndef GL_TEXTURE_GEN_STR_OES -#define GL_TEXTURE_GEN_STR_OES 0x8D60 +/* GLES 2.0 only tokens */ + +#ifndef GL_PROGRAM_BINARY_LENGTH_OES +#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741 #endif #ifndef GL_OES_texture_compression_astc @@ -105,15 +114,6 @@ typedef int GLclampx; #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES 0x93E9 #endif -#ifndef GL_ATI_texture_compression_3dc -#define GL_ATI_texture_compression_3dc 1 -#define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837 -#endif - -#ifndef GL_OES_compressed_ETC1_RGB8_texture -#define GL_ETC1_RGB8_OES 0x8D64 -#endif - #ifndef GL_EXT_shader_framebuffer_fetch #define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 #endif @@ -132,6 +132,13 @@ typedef int GLclampx; #define GL_FRAMEBUFFER_FLIP_Y_MESA 0x8BBB #endif +/* There is no formal spec for the following extension. */ +#ifndef GL_ATI_texture_compression_3dc +#define GL_ATI_texture_compression_3dc 1 +#define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837 +#endif + + /** * Internal token to represent a GLSL shader program (a collection of * one or more shaders that get linked together). Note that GLSL |