diff options
| author | Brian Paul <[email protected]> | 2010-09-14 09:16:40 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-09-14 09:16:40 -0600 |
| commit | 83f5f50f2f69adae497c71ac48e4e0177979ebff (patch) | |
| tree | 44a735f49ae3af9ef1b7143f509ce6981e5cb296 /src/mesa | |
| parent | 1c0644e9dac946131594216e23953a9c85335282 (diff) | |
mesa: move, redefine MESA_GEOMETRY_PROGRAM
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/glheader.h | 16 | ||||
| -rw-r--r-- | 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 a4044ff5cba..068a0f09949 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 cabc42b8543..864805af0ef 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 |