diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2006-04-06 13:55:23 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2006-04-06 13:55:23 +0000 |
| commit | 5ec1b4c08dbf33e1aa6d026775ddac5699717006 (patch) | |
| tree | 7669b96e1ad132dd4671b4c09019bbcd2ed34f6c | |
| parent | 26b6e4e77d5f07484c2e7f98a0dc8c278d8e5f97 (diff) | |
Renumber VERT_RESULT_ flags to match FRAG_ATTRIB flags
Add UsesKill flag for fragment programs
| -rw-r--r-- | src/mesa/main/mtypes.h | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index fbf18e0a70..2310bcf771 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -211,19 +211,20 @@ enum #define VERT_RESULT_HPOS 0 #define VERT_RESULT_COL0 1 #define VERT_RESULT_COL1 2 -#define VERT_RESULT_BFC0 3 -#define VERT_RESULT_BFC1 4 -#define VERT_RESULT_FOGC 5 -#define VERT_RESULT_PSIZ 6 -#define VERT_RESULT_TEX0 7 -#define VERT_RESULT_TEX1 8 -#define VERT_RESULT_TEX2 9 -#define VERT_RESULT_TEX3 10 -#define VERT_RESULT_TEX4 11 -#define VERT_RESULT_TEX5 12 -#define VERT_RESULT_TEX6 13 -#define VERT_RESULT_TEX7 14 -#define VERT_RESULT_MAX 15 +#define VERT_RESULT_FOGC 3 +#define VERT_RESULT_TEX0 4 +#define VERT_RESULT_TEX1 5 +#define VERT_RESULT_TEX2 6 +#define VERT_RESULT_TEX3 7 +#define VERT_RESULT_TEX4 8 +#define VERT_RESULT_TEX5 9 +#define VERT_RESULT_TEX6 10 +#define VERT_RESULT_TEX7 11 +#define VERT_RESULT_PSIZ 12 +#define VERT_RESULT_BFC0 13 +#define VERT_RESULT_BFC1 14 +#define VERT_RESULT_EDGE 15 +#define VERT_RESULT_MAX 16 /** @@ -242,7 +243,8 @@ enum FRAG_ATTRIB_TEX4 = 8, FRAG_ATTRIB_TEX5 = 9, FRAG_ATTRIB_TEX6 = 10, - FRAG_ATTRIB_TEX7 = 11 + FRAG_ATTRIB_TEX7 = 11, + FRAG_ATTRIB_MAX = 12 }; /* @@ -1800,6 +1802,7 @@ struct fragment_program GLuint NumTexIndirections; GLenum FogOption; struct program_parameter_list *Parameters; /**< array [NumParameters] */ + GLboolean UsesKill; #ifdef USE_TCC char c_str[4096]; /* experimental... */ |