Mesa (master): mesa: move, redefine MESA_GEOMETRY_PROGRAM
Brian Paul
brianp at kemper.freedesktop.org
Tue Sep 14 15:20:11 UTC 2010
Module: Mesa
Branch: master
Commit: 83f5f50f2f69adae497c71ac48e4e0177979ebff
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=83f5f50f2f69adae497c71ac48e4e0177979ebff
Author: Brian Paul <brianp at vmware.com>
Date: Tue Sep 14 09:16:40 2010 -0600
mesa: move, redefine MESA_GEOMETRY_PROGRAM
---
src/mesa/main/glheader.h | 16 +++++++++++++++-
src/mesa/main/mtypes.h | 8 --------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index a4044ff..068a0f0 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -122,10 +122,24 @@ typedef void *GLeglImageOES;
#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD
#endif
+
+
/**
- * Special, internal token
+ * Internal token to represent a GLSL shader program (a collection of
+ * one or more shaders that get linked together). Note that GLSL
+ * shaders and shader programs share one name space (one hash table)
+ * so we need a value that's different from any of the
+ * GL_VERTEX/FRAGMENT/GEOMETRY_PROGRAM tokens.
*/
#define GL_SHADER_PROGRAM_MESA 0x9999
+/**
+ * Internal token for geometry programs.
+ * Use the value for GL_GEOMETRY_PROGRAM_NV for now.
+ */
+#define MESA_GEOMETRY_PROGRAM 0x8c26
+
+
+
#endif /* GLHEADER_H */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index cabc42b..864805a 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -51,14 +51,6 @@
/**
- * Internal token
- * Must be simply different than GL_VERTEX_PROGRAM
- * and GL_FRAGMENT_PROGRAM_ARB
- * FIXME: this will have to be a real GL extension
- */
-#define MESA_GEOMETRY_PROGRAM 0x9999
-
-/**
* Color channel data type.
*/
#if CHAN_BITS == 8
More information about the mesa-commit
mailing list