[Mesa3d-dev] [PATCH 1/6] gallium: Remove TGSI_SEMANTIC_NORMAL.

[Luca B. <lu...@lu...>]

From: Michal Krol <mi...@vm...>

Use TGSI_SEMANTIC_GENERIC for this kind of stuff.
---
 src/gallium/auxiliary/tgsi/tgsi_dump.c         |    2 +-
 src/gallium/auxiliary/tgsi/tgsi_text.c         |    2 +-
 src/gallium/docs/source/tgsi.rst               |    6 ------
 src/gallium/drivers/svga/svga_tgsi_decl_sm30.c |    4 ----
 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 5703141..b6df249 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 f918151..356eee0 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 c292cd3..d5e0220 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 73102a7..05d9102 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 c5c480f..baff802 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
-- 
1.7.0.1.147.g6d84b