From: Patrice Mandin <patmandin@gmail.com>
Date: Wed, 21 Oct 2009 20:01:03 +0000 (+0200)
Subject: nouveau: nv30: Do not use assert to return NULL
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d364f662c685ba0f28aa865fbd7e1f0acc3c469e;p=mesa.git

nouveau: nv30: Do not use assert to return NULL
---

diff --git a/src/gallium/drivers/nv30/nv30_fragtex.c b/src/gallium/drivers/nv30/nv30_fragtex.c
index 822e1d8defe..a2ce947a72a 100644
--- a/src/gallium/drivers/nv30/nv30_fragtex.c
+++ b/src/gallium/drivers/nv30/nv30_fragtex.c
@@ -69,7 +69,7 @@ nv30_fragtex_build(struct nv30_context *nv30, int unit)
 
 	tf = nv30_fragtex_format(pt->format);
 	if (!tf)
-		assert(0);
+		return NULL;
 
 	txf  = tf->format;
 	txf |= ((pt->last_level>0) ? NV34TCL_TX_FORMAT_MIPMAP : 0);