diff options
| author | Michal Krol <michal@vmware.com> | 2010-03-03 10:29:31 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2010-03-03 10:29:31 +0100 |
| commit | 7230cb625c688aac7f43817bf83be542f99abd13 (patch) | |
| tree | d334080cfc484f8d21f4bb83400e32d316c34b96 | |
| parent | daf85c460875c944d6918fdf4041467d97cba41e (diff) | |
gallium: Remove TGSI_SEMANTIC_NORMAL.gallium-tgsi-semantic-cleanup
Use TGSI_SEMANTIC_GENERIC for this kind of stuff.
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_dump.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_text.c | 2 | ||||
| -rw-r--r-- | src/gallium/docs/source/tgsi.rst | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_tgsi_decl_sm30.c | 4 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_shader_tokens.h | 2 |
5 files changed, 3 insertions, 13 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_dump.c b/src/gallium/auxiliary/tgsi/tgsi_dump.c index 57031419f8..b6df249414 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_dump.c +++ b/src/gallium/auxiliary/tgsi/tgsi_dump.c @@ -120,7 +120,7 @@ static const char *semantic_names[] = "FOG", "PSIZE", "GENERIC", - "NORMAL", + "", "FACE", "EDGEFLAG", "PRIM_ID", diff --git a/src/gallium/auxiliary/tgsi/tgsi_text.c b/src/gallium/auxiliary/tgsi/tgsi_text.c index f918151daa..356eee05d9 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_text.c +++ b/src/gallium/auxiliary/tgsi/tgsi_text.c @@ -933,7 +933,7 @@ static const char *semantic_names[TGSI_SEMANTIC_COUNT] = "FOG", "PSIZE", "GENERIC", - "NORMAL", + "", "FACE", "EDGEFLAG", "PRIM_ID", diff --git a/src/gallium/docs/source/tgsi.rst b/src/gallium/docs/source/tgsi.rst index c292cd37d5..d5e022000f 100644 --- a/src/gallium/docs/source/tgsi.rst +++ b/src/gallium/docs/source/tgsi.rst @@ -1397,12 +1397,6 @@ These attributes are called "generic" because they may be used for anything else, including parameters, texture generation information, or anything that can be stored inside a four-component vector. -TGSI_SEMANTIC_NORMAL -"""""""""""""""""""" - -Vertex normal; could be used to implement per-pixel lighting for legacy APIs -that allow mixing fixed-function and programmable stages. - TGSI_SEMANTIC_FACE """""""""""""""""" diff --git a/src/gallium/drivers/svga/svga_tgsi_decl_sm30.c b/src/gallium/drivers/svga/svga_tgsi_decl_sm30.c index 73102a72a8..05d910210a 100644 --- a/src/gallium/drivers/svga/svga_tgsi_decl_sm30.c +++ b/src/gallium/drivers/svga/svga_tgsi_decl_sm30.c @@ -61,10 +61,6 @@ static boolean translate_vs_ps_semantic( struct tgsi_declaration_semantic semant *idx = semantic.Index + 1; /* texcoord[0] is reserved for fog */ *usage = SVGA3D_DECLUSAGE_TEXCOORD; break; - case TGSI_SEMANTIC_NORMAL: - *idx = semantic.Index; - *usage = SVGA3D_DECLUSAGE_NORMAL; - break; default: assert(0); *usage = SVGA3D_DECLUSAGE_TEXCOORD; diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index c5c480f1f0..baff8022e1 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -139,7 +139,7 @@ struct tgsi_declaration_dimension #define TGSI_SEMANTIC_FOG 3 #define TGSI_SEMANTIC_PSIZE 4 #define TGSI_SEMANTIC_GENERIC 5 -#define TGSI_SEMANTIC_NORMAL 6 + /* gap */ #define TGSI_SEMANTIC_FACE 7 #define TGSI_SEMANTIC_EDGEFLAG 8 #define TGSI_SEMANTIC_PRIMID 9 |