Mesa (master): tgsi: reject interpolation and semantics on vs inputs

Keith Whitwell keithw at kemper.freedesktop.org
Mon Jun 7 08:35:43 PDT 2010


Module: Mesa
Branch: master
Commit: 69faf5b48fde9d89b554c75fba7b431ddcd591da
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=69faf5b48fde9d89b554c75fba7b431ddcd591da

Author: Keith Whitwell <keithw at vmware.com>
Date:   Fri Jun  4 16:38:28 2010 +0100

tgsi: reject interpolation and semantics on vs inputs

---

 src/gallium/auxiliary/tgsi/tgsi_text.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_text.c b/src/gallium/auxiliary/tgsi/tgsi_text.c
index 71a0d96..00e6392 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_text.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_text.c
@@ -993,6 +993,7 @@ static boolean parse_declaration( struct translate_ctx *ctx )
    uint writemask;
    const char *cur;
    uint advance;
+   boolean is_vs_input;
 
    assert(Elements(semantic_names) == TGSI_SEMANTIC_COUNT);
    assert(Elements(interpolate_names) == TGSI_INTERPOLATE_COUNT);
@@ -1021,9 +1022,12 @@ static boolean parse_declaration( struct translate_ctx *ctx )
       decl.Dim.Index2D = brackets[0].first;
    }
 
+   is_vs_input = (file == TGSI_FILE_INPUT && 
+                  ctx->processor == TGSI_PROCESSOR_VERTEX);
+
    cur = ctx->cur;
    eat_opt_white( &cur );
-   if (*cur == ',') {
+   if (*cur == ',' && !is_vs_input) {
       uint i;
 
       cur++;
@@ -1066,7 +1070,7 @@ static boolean parse_declaration( struct translate_ctx *ctx )
 
    cur = ctx->cur;
    eat_opt_white( &cur );
-   if (*cur == ',') {
+   if (*cur == ',' && !is_vs_input) {
       uint i;
 
       cur++;



More information about the mesa-commit mailing list