added Window-isms previously in gl.h

[mesa.git] / src / mesa / main / enums.c

diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index b1b40a95cad89e8a660a88cadfb107bf8ef89b28..417a76bf3e8482144276caf790acd5b9a239d716 100644 (file)
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -1,10 +1,10 @@
-/* $Id: enums.c,v 1.3 1999/10/13 18:42:50 brianp Exp $ */
+/* $Id: enums.c,v 1.8 2000/03/28 16:59:39 rjfrank Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,11 +25,13 @@
  */
 
 
-#include "GL/gl.h"
+#ifdef PC_HEADER
+#include "all.h"
+#else
+#include "glheader.h"
 #include "enums.h"
-#include "macros.h"
-#include <stdlib.h>
-#include <string.h>
+#include "mem.h"
+#endif
 
 
 typedef struct { 
@@ -767,6 +769,12 @@ enum_elt all_enums[] =
    { "GL_CLIENT_ACTIVE_TEXTURE_ARB", 0x84E1 },
    { "GL_MAX_TEXTURE_UNITS_ARB", 0x84E2 },
 
+   { "GL_OCCLUSION_TEST_HP", 0x8165 },
+   { "GL_OCCLUSION_TEST_RESULT_HP", 0x8166 },
+
+   { "GL_TEXTURE_FILTER_CONTROL_EXT", 0x8500 },
+   { "GL_TEXTUER_LOD_BIAS_EXT", 0x8501 },
+
    { "GL_NORMAL_MAP_NV", 0x8511 },
    { "GL_REFLECTION_MAP_NV", 0x8512 },
 
@@ -793,8 +801,8 @@ enum_elt all_enums[] =
    { "GL_NATIVE_GRAPHICS_HANDLE_PGI", 107010 },
 
    /* GL_EXT_compiled_vertex_array */
-   { "GL_ARRAY_ELEMENT_LOCK_FIRST_SGI", 0x81A8},
-   { "GL_ARRAY_ELEMENT_LOCK_COUNT_SGI", 0x81A9},
+   { "GL_ARRAY_ELEMENT_LOCK_FIRST_EXT", 0x81A8},
+   { "GL_ARRAY_ELEMENT_LOCK_COUNT_EXT", 0x81A9},
 
    /* GL_EXT_clip_volume_hint */
    { "GL_CLIP_VOLUME_CLIPPING_HINT_EXT", 0x80F0}