Mesa (master): i965: Fix two broken asserts in brw_eu_emit

Chris Forbes chrisf at kemper.freedesktop.org
Fri Jul 11 23:31:00 UTC 2014


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

Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Sun Jul  6 20:11:05 2014 +1200

i965: Fix two broken asserts in brw_eu_emit

These were looking in the wrong field.

Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/drivers/dri/i965/brw_eu_emit.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c
index cd5bc9f..3f00e4d 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
@@ -314,7 +314,7 @@ brw_set_src0(struct brw_compile *p, brw_inst *inst, struct brw_reg reg)
 {
    struct brw_context *brw = p->brw;
 
-   if (reg.type != BRW_ARCHITECTURE_REGISTER_FILE)
+   if (reg.file != BRW_ARCHITECTURE_REGISTER_FILE)
       assert(reg.nr < 128);
 
    gen7_convert_mrf_to_grf(p, &reg);
@@ -455,7 +455,7 @@ brw_set_src1(struct brw_compile *p, brw_inst *inst, struct brw_reg reg)
    const struct brw_context *brw = p->brw;
    assert(reg.file != BRW_MESSAGE_REGISTER_FILE);
 
-   if (reg.type != BRW_ARCHITECTURE_REGISTER_FILE)
+   if (reg.file != BRW_ARCHITECTURE_REGISTER_FILE)
       assert(reg.nr < 128);
 
    gen7_convert_mrf_to_grf(p, &reg);




More information about the mesa-commit mailing list