summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConnor Abbott <[email protected]>2014-08-08 16:25:34 -0700
committerMatt Turner <[email protected]>2014-08-10 15:00:53 -0700
commitb6df68ba5611bfd5b797301f32da0b9a33fc5849 (patch)
tree93d1ecca50b62600facd5fdf7af127a0bcd57b28
parent58007aec4193e3bdb38cafcfb2188dcbd8f18def (diff)
i965/fs: set virtual_grf_count in assign_regs()
This lets us call dump_instructions() after register allocation without failing an assertion. Reviewed-by: Matt Turner <[email protected]> Signed-off-by: Connor Abbott <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
index 2233621b3cd..d62627153c2 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
@@ -64,6 +64,8 @@ fs_visitor::assign_regs_trivial()
if (this->grf_used >= max_grf) {
fail("Ran out of regs on trivial allocator (%d/%d)\n",
this->grf_used, max_grf);
+ } else {
+ this->virtual_grf_count = this->grf_used;
}
}
@@ -523,6 +525,8 @@ fs_visitor::assign_regs(bool allow_spilling)
}
}
+ this->virtual_grf_count = this->grf_used;
+
ralloc_free(g);
return true;