From: Nicolai Hähnle <nhaehnle@gmail.com>
Date: Sun, 11 Oct 2009 12:24:52 +0000 (+0200)
Subject: r300/compiler: Use memory_pool_array_reserve in deadcode elimination
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=65fd6fb2044521511b867c76e270f285d0b15f06;p=mesa.git

r300/compiler: Use memory_pool_array_reserve in deadcode elimination

Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
---

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_dataflow_deadcode.c b/src/mesa/drivers/dri/r300/compiler/radeon_dataflow_deadcode.c
index f3734852cc6..e3c2c83c0cf 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_dataflow_deadcode.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_dataflow_deadcode.c
@@ -80,19 +80,8 @@ static void or_updatemasks(
 
 static void push_branch(struct deadcode_state * s)
 {
-	if (s->BranchStackSize >= s->BranchStackReserved) {
-		unsigned int new_reserve = 2 * s->BranchStackReserved;
-		struct branchinfo * new_stack;
-
-		if (!new_reserve)
-			new_reserve = 4;
-
-		new_stack = memory_pool_malloc(&s->C->Pool, new_reserve * sizeof(struct branchinfo));
-		memcpy(new_stack, s->BranchStack, s->BranchStackSize * sizeof(struct branchinfo));
-
-		s->BranchStack = new_stack;
-		s->BranchStackReserved = new_reserve;
-	}
+	memory_pool_array_reserve(&s->C->Pool, struct branchinfo, s->BranchStack,
+			s->BranchStackSize, s->BranchStackReserved, 1);
 
 	struct branchinfo * branch = &s->BranchStack[s->BranchStackSize++];
 	branch->HaveElse = 0;