Mesa (master): nir: Fix copy and pasted error message in nir_validate.

Kenneth Graunke kwg at kemper.freedesktop.org
Sat Mar 28 16:37:00 UTC 2015


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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Mar 27 18:22:20 2015 -0700

nir: Fix copy and pasted error message in nir_validate.

These are nir_cf_nodes, not ALU instructions.
Also, use unreachable() to preempt said review feedback.

v2: Do it right (thanks Ilia).

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>

---

 src/glsl/nir/nir_validate.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/glsl/nir/nir_validate.c b/src/glsl/nir/nir_validate.c
index f247ae0..e8c9d7b 100644
--- a/src/glsl/nir/nir_validate.c
+++ b/src/glsl/nir/nir_validate.c
@@ -680,8 +680,7 @@ validate_cf_node(nir_cf_node *node, validate_state *state)
       break;
 
    default:
-      assert(!"Invalid ALU instruction type");
-      break;
+      unreachable("Invalid CF node type");
    }
 }
 




More information about the mesa-commit mailing list