From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 7 Jan 2016 22:37:53 +0000 (+0100)
Subject: tgsi/ureg: handle redundant declarations in ureg_DECL_system_value
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c07cf5f5a92d3c7d433a05a06faf9d262a732f4a;p=mesa.git

tgsi/ureg: handle redundant declarations in ureg_DECL_system_value

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
---

diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.c b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
index 964272386b3..5b78542413e 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
@@ -322,7 +322,14 @@ ureg_DECL_system_value(struct ureg_program *ureg,
                        unsigned semantic_name,
                        unsigned semantic_index)
 {
-   unsigned i = 0;
+   unsigned i;
+
+   for (i = 0; i < ureg->nr_system_values; i++) {
+      if (ureg->system_value[i].semantic_name == semantic_name &&
+          ureg->system_value[i].semantic_index == semantic_index) {
+         goto out;
+      }
+   }
 
    if (ureg->nr_system_values < UREG_MAX_SYSTEM_VALUE) {
       ureg->system_value[ureg->nr_system_values].semantic_name = semantic_name;
@@ -333,6 +340,7 @@ ureg_DECL_system_value(struct ureg_program *ureg,
       set_bad(ureg);
    }
 
+out:
    return ureg_src_register(TGSI_FILE_SYSTEM_VALUE, i);
 }