Mesa (staging/19.1): nir: don't return void

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: aff5714c65db9421e0865744062471e040ef4187
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=aff5714c65db9421e0865744062471e040ef4187

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Fri Jul 19 22:23:38 2019 +0100

nir: don't return void

Fixes: 14531d676b11999123c0 ("nir: make nir_const_value scalar")
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Karol Herbst <kherbst at redhat.com>
(cherry picked from commit 3acc4278ad4138ad3a914085aefd7c47d46e1ad4)

---

 src/compiler/nir/nir_constant_expressions.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_constant_expressions.py b/src/compiler/nir/nir_constant_expressions.py
index f26fd0a3ea2..ed420c300f2 100644
--- a/src/compiler/nir/nir_constant_expressions.py
+++ b/src/compiler/nir/nir_constant_expressions.py
@@ -414,7 +414,8 @@ nir_eval_const_opcode(nir_op op, nir_const_value *dest,
    switch (op) {
 % for name in sorted(opcodes.keys()):
    case nir_op_${name}:
-      return evaluate_${name}(dest, num_components, bit_width, src);
+      evaluate_${name}(dest, num_components, bit_width, src);
+      return;
 % endfor
    default:
       unreachable("shouldn't get here");