diff options
| author | Jakob Bornecrantz <[email protected]> | 2009-07-03 18:53:58 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2009-07-03 18:53:58 +0200 |
| commit | 862488075c5537b0613753b0d14c267527fc6199 (patch) | |
| tree | fd4d51272c86fbc88c12e2d16649547f3ca7b8df /src/gallium/include | |
| parent | 060c7f2321f72503c14f9f3f7bb27d59d8a90224 (diff) | |
| parent | 94e1117c9ba259665cd8e790369dcd4c789a2f93 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/main/dlist.c
src/mesa/vbo/vbo_save_api.c
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_shader_tokens.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index 4dafdd6f0a9..b00cfe3423c 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -131,7 +131,8 @@ struct tgsi_declaration_range #define TGSI_SEMANTIC_PSIZE 4 #define TGSI_SEMANTIC_GENERIC 5 #define TGSI_SEMANTIC_NORMAL 6 -#define TGSI_SEMANTIC_COUNT 7 /**< number of semantic values */ +#define TGSI_SEMANTIC_FACE 7 +#define TGSI_SEMANTIC_COUNT 8 /**< number of semantic values */ struct tgsi_declaration_semantic { |