Mesa (master): i965: Inform compiler of variable range to silence warning.

Matt Turner mattst88 at kemper.freedesktop.org
Tue Jan 19 20:11:11 UTC 2016


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

Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Jan 15 13:38:46 2016 -0800

i965: Inform compiler of variable range to silence warning.

Extends commit 6531ccb70 to silence the warning in release builds as
well.

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 src/mesa/drivers/dri/i965/brw_vue_map.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_vue_map.c b/src/mesa/drivers/dri/i965/brw_vue_map.c
index fea2436..b66c209 100644
--- a/src/mesa/drivers/dri/i965/brw_vue_map.c
+++ b/src/mesa/drivers/dri/i965/brw_vue_map.c
@@ -248,6 +248,8 @@ brw_compute_tess_vue_map(struct brw_vue_map *vue_map,
 static const char *
 varying_name(brw_varying_slot slot)
 {
+   assume(slot < BRW_VARYING_SLOT_COUNT);
+
    if (slot < VARYING_SLOT_MAX)
       return gl_varying_slot_name(slot);
 
@@ -257,7 +259,6 @@ varying_name(brw_varying_slot slot)
       [BRW_VARYING_SLOT_PNTC - VARYING_SLOT_MAX] = "BRW_VARYING_SLOT_PNTC",
    };
 
-   assert(slot < BRW_VARYING_SLOT_COUNT);
    return brw_names[slot - VARYING_SLOT_MAX];
 }
 




More information about the mesa-commit mailing list