Mesa (master): r200: Fix probable thinko in r200EmitArrays

Andreas Boll ab at kemper.freedesktop.org
Sun Jan 13 11:43:26 UTC 2013


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

Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Jan  4 14:26:20 2013 -0500

r200: Fix probable thinko in r200EmitArrays

Effectively this path would always assert.  Move the break statement to
the (probable) intended place.

Note: This is a candidate for the stable branches.

Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>

---

 src/mesa/drivers/dri/r200/r200_maos_arrays.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/r200/r200_maos_arrays.c b/src/mesa/drivers/dri/r200/r200_maos_arrays.c
index 973dcaf..d7607bc 100644
--- a/src/mesa/drivers/dri/r200/r200_maos_arrays.c
+++ b/src/mesa/drivers/dri/r200/r200_maos_arrays.c
@@ -166,8 +166,9 @@ void r200EmitArrays( struct gl_context *ctx, GLubyte *vimap_rev )
 	       /* fallthrough */
 	    case 4:
 	       vfmt0 |= R200_VTX_W1;
-	    break;
+	       /* fallthrough */
 	    }
+	    break;
 	 default:
 	    assert(0);
 	    emitsize = 0;




More information about the mesa-commit mailing list