Mesa (master): nir: remove old assert

Timothy Arceri tarceri at kemper.freedesktop.org
Wed Feb 21 22:31:13 UTC 2018


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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Wed Feb 21 14:36:09 2018 +1100

nir: remove old assert

This was originally intended to make sure the remap location
was not -1. However the code has changed alot since then,
the location is now never set to -1 and we also handle
components meaning this old assert has been doing comparisions
with the pointer to the array of component data.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105183

---

 src/compiler/nir/nir_linking_helpers.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/compiler/nir/nir_linking_helpers.c b/src/compiler/nir/nir_linking_helpers.c
index 6459c6a24d..2b0a2668a3 100644
--- a/src/compiler/nir/nir_linking_helpers.c
+++ b/src/compiler/nir/nir_linking_helpers.c
@@ -283,7 +283,6 @@ remap_slots_and_components(struct exec_list *var_list, gl_shader_stage stage,
       if (var->data.location >= VARYING_SLOT_VAR0 &&
           var->data.location - VARYING_SLOT_VAR0 < 32) {
          assert(var->data.location - VARYING_SLOT_VAR0 < 32);
-         assert(remap[var->data.location - VARYING_SLOT_VAR0] >= 0);
 
          const struct glsl_type *type = var->type;
          if (nir_is_per_vertex_io(var, stage)) {




More information about the mesa-commit mailing list