Mesa (master): ra: Use the same context when realloc'ing arrays.

Kenneth Graunke kwg at kemper.freedesktop.org
Fri Jan 21 23:51:12 UTC 2011


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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jan 21 15:39:57 2011 -0800

ra: Use the same context when realloc'ing arrays.

The original allocations use regs->regs as the context, so talloc will
happily ignore the context given here.  Change it to match to clarify
that it isn't changing.

---

 src/mesa/program/register_allocate.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/program/register_allocate.c b/src/mesa/program/register_allocate.c
index f984e2f..700e351 100644
--- a/src/mesa/program/register_allocate.c
+++ b/src/mesa/program/register_allocate.c
@@ -120,7 +120,7 @@ ra_add_conflict_list(struct ra_regs *regs, unsigned int r1, unsigned int r2)
 
    if (reg1->conflict_list_size == reg1->num_conflicts) {
       reg1->conflict_list_size *= 2;
-      reg1->conflict_list = talloc_realloc(regs,
+      reg1->conflict_list = talloc_realloc(regs->regs,
 					   reg1->conflict_list,
 					   unsigned int,
 					   reg1->conflict_list_size);
@@ -143,7 +143,7 @@ ra_alloc_reg_class(struct ra_regs *regs)
 {
    struct ra_class *class;
 
-   regs->classes = talloc_realloc(regs, regs->classes,
+   regs->classes = talloc_realloc(regs->regs, regs->classes,
 				  struct ra_class *,
 				  regs->class_count + 1);
 




More information about the mesa-commit mailing list