Mesa (master): r300c: Unbreak after R4xx support was added to r300/compiler .
Michel Dänzer
daenzer at kemper.freedesktop.org
Thu Feb 3 12:54:05 UTC 2011
Module: Mesa
Branch: master
Commit: 7535f93e5a98e5e79d76c07ccabe59f576ce01f0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7535f93e5a98e5e79d76c07ccabe59f576ce01f0
Author: Michel Dänzer <daenzer at vmware.com>
Date: Thu Feb 3 13:25:16 2011 +0100
r300c: Unbreak after R4xx support was added to r300/compiler.
---
src/mesa/drivers/dri/r300/r300_blit.c | 1 +
src/mesa/drivers/dri/r300/r300_fragprog_common.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/mesa/drivers/dri/r300/r300_blit.c b/src/mesa/drivers/dri/r300/r300_blit.c
index de4e5f0..14e6086 100644
--- a/src/mesa/drivers/dri/r300/r300_blit.c
+++ b/src/mesa/drivers/dri/r300/r300_blit.c
@@ -129,6 +129,7 @@ static void create_fragment_program(struct r300_context *r300)
compiler.Base.max_temp_regs = (compiler.Base.is_r500) ? 128 : 32;
compiler.Base.max_constants = compiler.Base.is_r500 ? 256 : 32;
compiler.Base.max_alu_insts = compiler.Base.is_r500 ? 512 : 64;
+ compiler.Base.max_tex_insts = compiler.Base.is_r500 ? 512 : 32;
compiler.code = &r300->blit.fp_code;
compiler.AllocateHwInputs = fp_allocate_hw_inputs;
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
index 4e457b5..a0a26f1 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog_common.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
@@ -226,6 +226,7 @@ static void translate_fragment_program(struct gl_context *ctx, struct r300_fragm
compiler.Base.max_temp_regs = (compiler.Base.is_r500) ? 128 : 32;
compiler.Base.max_constants = compiler.Base.is_r500 ? 256 : 32;
compiler.Base.max_alu_insts = compiler.Base.is_r500 ? 512 : 64;
+ compiler.Base.max_tex_insts = compiler.Base.is_r500 ? 512 : 32;
compiler.OutputDepth = FRAG_RESULT_DEPTH;
memset(compiler.OutputColor, 0, 4 * sizeof(unsigned));
compiler.OutputColor[0] = FRAG_RESULT_COLOR;
More information about the mesa-commit
mailing list