[Mesa-dev] [PATCH 1/3] gallium: add new semantic for clip vertex.

2012-01-04 Thread Dave Airlie 
From: Dave Airlie airl...@redhat.com

This is to match the gl_ClipVertex output from GLSL 1.20.

Signed-off-by: Dave Airlie airl...@redhat.com
---
 src/gallium/auxiliary/tgsi/tgsi_dump.c |3 ++-
 src/gallium/include/pipe/p_shader_tokens.h |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_dump.c 
b/src/gallium/auxiliary/tgsi/tgsi_dump.c
index e830aa5..6c5fc68 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_dump.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump.c
@@ -129,7 +129,8 @@ static const char *semantic_names[] =
PRIM_ID,
INSTANCEID,
VERTEXID,
-   STENCIL
+   STENCIL,
+   VERTEXCLIP
 };
 
 static const char *immediate_type_names[] =
diff --git a/src/gallium/include/pipe/p_shader_tokens.h 
b/src/gallium/include/pipe/p_shader_tokens.h
index 10cfaf6..35835bb 100644
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ -146,7 +146,8 @@ struct tgsi_declaration_dimension
 #define TGSI_SEMANTIC_INSTANCEID 10
 #define TGSI_SEMANTIC_VERTEXID   11
 #define TGSI_SEMANTIC_STENCIL12
-#define TGSI_SEMANTIC_COUNT  13 /** number of semantic values */
+#define TGSI_SEMANTIC_CLIPVERTEX 13
+#define TGSI_SEMANTIC_COUNT  14 /** number of semantic values */
 
 struct tgsi_declaration_semantic
 {
-- 
1.7.7.3

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/3] gallium: add new semantic for clip vertex.

2012-01-04 Thread Brian Paul 

On 01/04/2012 05:12 AM, Dave Airlie wrote:

From: Dave Airlieairl...@redhat.com

This is to match the gl_ClipVertex output from GLSL 1.20.

Signed-off-by: Dave Airlieairl...@redhat.com
---
  src/gallium/auxiliary/tgsi/tgsi_dump.c |3 ++-
  src/gallium/include/pipe/p_shader_tokens.h |3 ++-
  2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_dump.c 
b/src/gallium/auxiliary/tgsi/tgsi_dump.c
index e830aa5..6c5fc68 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_dump.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump.c
@@ -129,7 +129,8 @@ static const char *semantic_names[] =
 PRIM_ID,
 INSTANCEID,
 VERTEXID,
-   STENCIL
+   STENCIL,
+   VERTEXCLIP
  };


There's also an array of semantic strings in tgsi_text.c.  But I just 
posted a patch to consolidate these string arrays and add static 
assertions to void missing things like that in the future.





  static const char *immediate_type_names[] =
diff --git a/src/gallium/include/pipe/p_shader_tokens.h 
b/src/gallium/include/pipe/p_shader_tokens.h
index 10cfaf6..35835bb 100644
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ -146,7 +146,8 @@ struct tgsi_declaration_dimension
  #define TGSI_SEMANTIC_INSTANCEID 10
  #define TGSI_SEMANTIC_VERTEXID   11
  #define TGSI_SEMANTIC_STENCIL12
-#define TGSI_SEMANTIC_COUNT  13 /**  number of semantic values */
+#define TGSI_SEMANTIC_CLIPVERTEX 13
+#define TGSI_SEMANTIC_COUNT  14 /**  number of semantic values */

  struct tgsi_declaration_semantic
  {


___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev