From: Connor Abbott <cwabbott0@gmail.com>
Date: Fri, 8 Aug 2014 23:25:34 +0000 (-0700)
Subject: i965/fs: set virtual_grf_count in assign_regs()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b6df68ba5611bfd5b797301f32da0b9a33fc5849;p=mesa.git

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 <mattst88@gmail.com>
Signed-off-by: Connor Abbott <connor.abbott@intel.com>
---

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;