Mesa (master): i965: Fix assertion in brw_reg_type_letters

Ben Widawsky bwidawsk at kemper.freedesktop.org
Tue Mar 3 03:55:44 UTC 2015


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

Author: Ben Widawsky <benjamin.widawsky at intel.com>
Date:   Fri Nov 28 14:28:19 2014 -0800

i965: Fix assertion in brw_reg_type_letters

While using various debugging features (optimization debug, instruction dumping,
etc) this function is called in order to get a readable letter for the type of
unit.

On GEN8, two new units were added, the Qword and the Unsigned Qword (Q, and UQ
respectively). The existing assertion tries to determine that the argument
passed in is within the correct boundary, however, it was using UQ as the upper
limit instead of Q.

To my knowledge you can only hit this case with the branch I am currently
working on, so it doesn't fix any known issues.

Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/drivers/dri/i965/brw_eu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_eu.c b/src/mesa/drivers/dri/i965/brw_eu.c
index a1b7fda..146202b 100644
--- a/src/mesa/drivers/dri/i965/brw_eu.c
+++ b/src/mesa/drivers/dri/i965/brw_eu.c
@@ -61,7 +61,7 @@ brw_reg_type_letters(unsigned type)
       [BRW_REGISTER_TYPE_UQ] = "UQ",
       [BRW_REGISTER_TYPE_Q]  = "Q",
    };
-   assert(type <= BRW_REGISTER_TYPE_UQ);
+   assert(type <= BRW_REGISTER_TYPE_Q);
    return names[type];
 }
 




More information about the mesa-commit mailing list