From 9a9aa7daa84341daae6a18dd6c13b958979d2343 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 1 Sep 2010 01:55:26 +0200 Subject: [PATCH] r300/compiler: remove a redundant parameter in rc_pair_regalloc --- src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c | 2 +- src/mesa/drivers/dri/r300/compiler/radeon_pair_regalloc.c | 3 ++- src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c b/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c index 35e8c75824c..45d51b98351 100644 --- a/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c +++ b/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c @@ -210,7 +210,7 @@ void r3xx_compile_fragment_program(struct r300_fragment_program_compiler* c) debug_program_log(c, "after pair scheduling"); - rc_pair_regalloc(c, c->Base.max_temp_regs); + rc_pair_regalloc(c); if (c->Base.Error) return; diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_pair_regalloc.c b/src/mesa/drivers/dri/r300/compiler/radeon_pair_regalloc.c index ce72cd97ab2..3664a651270 100644 --- a/src/mesa/drivers/dri/r300/compiler/radeon_pair_regalloc.c +++ b/src/mesa/drivers/dri/r300/compiler/radeon_pair_regalloc.c @@ -292,8 +292,9 @@ static void alloc_input(void * data, unsigned int input, unsigned int hwreg) } -void rc_pair_regalloc(struct r300_fragment_program_compiler *c, unsigned maxtemps) +void rc_pair_regalloc(struct r300_fragment_program_compiler *c) { + unsigned maxtemps = c->Base.max_temp_regs; struct regalloc_state s; memset(&s, 0, sizeof(s)); diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h b/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h index 511cc707a38..44ef2524980 100644 --- a/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h +++ b/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h @@ -120,7 +120,7 @@ struct radeon_pair_handler; void rc_pair_translate(struct r300_fragment_program_compiler *c); void rc_pair_schedule(struct r300_fragment_program_compiler *c); -void rc_pair_regalloc(struct r300_fragment_program_compiler *c, unsigned maxtemps); +void rc_pair_regalloc(struct r300_fragment_program_compiler *c); /*@}*/ #endif /* __RADEON_PROGRAM_PAIR_H_ */ -- 2.30.2