Merge branch 'mesa_7_5_branch'

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

diff --git a/src/mesa/main/enums.h b/src/mesa/main/enums.h
index ff59233296a6b260c26260499ea7c3e632d8e921..b5f69001b84fe5ca9a676b329fe97a1229c3b1ca 100644 (file)
--- a/src/mesa/main/enums.h
+++ b/src/mesa/main/enums.h
@@ -1,9 +1,18 @@
+/**
+ * \file enums.h
+ * Enumeration name/number lookup functions.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.5.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  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"),
@@ -27,7 +36,26 @@
 #ifndef _ENUMS_H_
 #define _ENUMS_H_
 
+
+#if defined(_HAVE_FULL_GL) && _HAVE_FULL_GL
+
 extern const char *_mesa_lookup_enum_by_nr( int nr );
+
+/* Get the name of an enum given that it is a primitive type.  Avoids
+ * GL_FALSE/GL_POINTS ambiguity and others.
+ */
+const char *_mesa_lookup_prim_by_nr( int nr );
+
 extern int _mesa_lookup_enum_by_name( const char *symbol );
 
+#else
+
+/** No-op */
+#define _mesa_lookup_enum_by_name( s ) 0
+
+/** No-op */
+#define _mesa_lookup_enum_by_nr( n ) "unknown"
+
+#endif
+
 #endif