Mesa (mesa_7_0_branch): i965: Allocate temporaries contiguously with other regs in fragment shaders.
Gary Wong
gary at kemper.freedesktop.org
Tue Oct 28 19:20:39 UTC 2008
Module: Mesa
Branch: mesa_7_0_branch
Commit: 304e8a8b0919d0a11a9f9866bb6eda9923d267e2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=304e8a8b0919d0a11a9f9866bb6eda9923d267e2
Author: Gary Wong <gtw at gnu.org>
Date: Tue Oct 28 15:03:14 2008 -0400
i965: Allocate temporaries contiguously with other regs in fragment shaders.
This is required for threads to be spawned with correctly sized GRF
register blocks.
---
src/mesa/drivers/dri/i965/brw_wm.h | 2 ++
src/mesa/drivers/dri/i965/brw_wm_glsl.c | 8 +++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_wm.h b/src/mesa/drivers/dri/i965/brw_wm.h
index 9fb231d..e4c7429 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.h
+++ b/src/mesa/drivers/dri/i965/brw_wm.h
@@ -243,7 +243,9 @@ struct brw_wm_compile {
struct brw_reg stack;
struct brw_reg emit_mask_reg;
GLuint reg_index;
+ GLuint tmp_regs[BRW_WM_MAX_GRF];
GLuint tmp_index;
+ GLuint tmp_max;
};
diff --git a/src/mesa/drivers/dri/i965/brw_wm_glsl.c b/src/mesa/drivers/dri/i965/brw_wm_glsl.c
index 5a1f80d..16eda0c 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_glsl.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_glsl.c
@@ -47,13 +47,16 @@ static int get_scalar_dst_index(struct prog_instruction *inst)
static struct brw_reg alloc_tmp(struct brw_wm_compile *c)
{
struct brw_reg reg;
- reg = brw_vec8_grf(c->tmp_index--, 0);
+ if(c->tmp_index == c->tmp_max)
+ c->tmp_regs[ c->tmp_max++ ] = c->reg_index++;
+
+ reg = brw_vec8_grf(c->tmp_regs[ c->tmp_index++ ], 0);
return reg;
}
static void release_tmps(struct brw_wm_compile *c)
{
- c->tmp_index = 127;
+ c->tmp_index = 0;
}
static struct brw_reg
@@ -1363,7 +1366,6 @@ static void brw_wm_emit_glsl(struct brw_context *brw, struct brw_wm_compile *c)
void brw_wm_glsl_emit(struct brw_context *brw, struct brw_wm_compile *c)
{
brw_wm_pass_fp(c);
- c->tmp_index = 127;
brw_wm_emit_glsl(brw, c);
c->prog_data.total_grf = c->reg_index;
c->prog_data.total_scratch = 0;
More information about the mesa-commit
mailing list