libxcb xserver pixman mesa git update 20 sep 2012

libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea
xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345
pixman: 3124a51abb89475b8c5045bc96e04c5852694a16
mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9

1 files changed, 14 insertions, 1 deletions

diff --git a/mesalib/src/mesa/program/register_allocate.c b/mesalib/src/mesa/program/register_allocate.c
index f08c9d28d..97d4e331c 100644
--- a/mesalib/src/mesa/program/register_allocate.c
+++ b/mesalib/src/mesa/program/register_allocate.c
@@ -255,9 +255,11 @@ ra_class_add_reg(struct ra_regs *regs, unsigned int c, unsigned int r)
 /**
  * Must be called after all conflicts and register classes have been
  * set up and before the register set is used for allocation.
+ * To avoid costly q value computation, use the q_values paramater
+ * to pass precomputed q values to this function.
  */
 void
-ra_set_finalize(struct ra_regs *regs)
+ra_set_finalize(struct ra_regs *regs, unsigned int **q_values)
 {
    unsigned int b, c;
 
@@ -265,6 +267,15 @@ ra_set_finalize(struct ra_regs *regs)
       regs->classes[b]->q = ralloc_array(regs, unsigned int, regs->class_count);
    }
 
+   if (q_values) {
+      for (b = 0; b < regs->class_count; b++) {
+         for (c = 0; c < regs->class_count; c++) {
+            regs->classes[b]->q[c] = q_values[b][c];
+	 }
+      }
+      return;
+   }
+
    /* Compute, for each class B and C, how many regs of B an
     * allocation to C could conflict with.
     */
@@ -490,6 +501,8 @@ ra_get_node_reg(struct ra_graph *g, unsigned int n)
  * input data).  These nodes do not end up in the stack during
  * ra_simplify(), and thus at ra_select() time it is as if they were
  * the first popped off the stack and assigned their fixed locations.
+ * Nodes that use this function do not need to be assigned a register
+ * class.
  *
  * Must be called before ra_simplify().
  */