From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 29 Dec 2015 23:35:29 +0000 (-0800)
Subject: nir/validate: Don't validate the return deref for void function calls
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=69d5838aee2fe80548517eaccbd3a9a6555ae99e;p=mesa.git

nir/validate: Don't validate the return deref for void function calls
---

diff --git a/src/glsl/nir/nir_validate.c b/src/glsl/nir/nir_validate.c
index e4db68db3c0..91c01ff8727 100644
--- a/src/glsl/nir/nir_validate.c
+++ b/src/glsl/nir/nir_validate.c
@@ -454,10 +454,12 @@ validate_tex_instr(nir_tex_instr *instr, validate_state *state)
 static void
 validate_call_instr(nir_call_instr *instr, validate_state *state)
 {
-   if (instr->return_deref == NULL)
+   if (instr->return_deref == NULL) {
       assert(glsl_type_is_void(instr->callee->return_type));
-   else
+   } else {
       assert(instr->return_deref->deref.type == instr->callee->return_type);
+      validate_deref_var(instr, instr->return_deref, state);
+   }
 
    assert(instr->num_params == instr->callee->num_params);
 
@@ -465,8 +467,6 @@ validate_call_instr(nir_call_instr *instr, validate_state *state)
       assert(instr->callee->params[i].type == instr->params[i]->deref.type);
       validate_deref_var(instr, instr->params[i], state);
    }
-
-   validate_deref_var(instr, instr->return_deref, state);
 }
 
 static void