mesa: replace GLenum with GLenum16 in common structures (v4)

[mesa.git] / src / mesa / main / glheader.h

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 9d299e880c41110636018b8e2936037e548f899c..7a4b4a08d3ae4d36b8ed71a90c706a32316e02a6 100644 (file)
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -43,6 +43,7 @@ extern "C" {
 #endif
 
 
+typedef unsigned short GLenum16; /* custom Mesa type to save space */
 typedef int GLclampx;
 
 
@@ -99,6 +100,29 @@ typedef void *GLeglImageOES;
 #define GL_PALETTE8_RGB5_A1_OES                                 0x8B99
 #endif
 
+#ifndef GL_OES_texture_compression_astc
+#define GL_COMPRESSED_RGBA_ASTC_3x3x3_OES                       0x93C0
+#define GL_COMPRESSED_RGBA_ASTC_4x3x3_OES                       0x93C1
+#define GL_COMPRESSED_RGBA_ASTC_4x4x3_OES                       0x93C2
+#define GL_COMPRESSED_RGBA_ASTC_4x4x4_OES                       0x93C3
+#define GL_COMPRESSED_RGBA_ASTC_5x4x4_OES                       0x93C4
+#define GL_COMPRESSED_RGBA_ASTC_5x5x4_OES                       0x93C5
+#define GL_COMPRESSED_RGBA_ASTC_5x5x5_OES                       0x93C6
+#define GL_COMPRESSED_RGBA_ASTC_6x5x5_OES                       0x93C7
+#define GL_COMPRESSED_RGBA_ASTC_6x6x5_OES                       0x93C8
+#define GL_COMPRESSED_RGBA_ASTC_6x6x6_OES                       0x93C9
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES               0x93E0
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES               0x93E1
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES               0x93E2
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES               0x93E3
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES               0x93E4
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES               0x93E5
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES               0x93E6
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES               0x93E7
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES               0x93E8
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES               0x93E9
+#endif
+
 #ifndef GL_ES_VERSION_2_0
 #define GL_SHADER_BINARY_FORMATS                                0x8DF8
 #define GL_NUM_SHADER_BINARY_FORMATS                            0x8DF9
@@ -117,6 +141,13 @@ typedef void *GLeglImageOES;
 #define GL_ETC1_RGB8_OES                                        0x8D64
 #endif
 
+#ifndef GL_EXT_shader_framebuffer_fetch
+#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT                 0x8A52
+#endif
+
+#ifndef GL_EXT_disjoint_timer_query
+#define GL_GPU_DISJOINT_EXT                                     0x8FBB
+#endif
 
 /* Inexplicably, GL_HALF_FLOAT_OES has a different value than GL_HALF_FLOAT.
  */