diff options
| author | Nicolai Hähnle <[email protected]> | 2009-07-30 22:26:02 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2009-07-30 23:42:59 +0200 |
| commit | cab62aa28f5ccdf7ca185ac965b852e2318816f3 (patch) | |
| tree | 96d1c17d4c6d87eda54e9ea11ad0ba3e67b92266 | |
| parent | 9f26f801dc34b1705fe724aab8a6c3189596149b (diff) | |
r300/compiler: Remove inst_offset from r500_fragment_program_code
The field is not used, and in any case it would be more interesting to
manipulate from *outside* the compiler if we ever wanted to load several
fragment programs at the same time or something.
Signed-off-by: Nicolai Hähnle <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/compiler/radeon_code.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c b/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c index 3a527210c17..d694725c9bb 100644 --- a/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c +++ b/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c @@ -279,7 +279,6 @@ void r500BuildFragmentProgramHwCode(struct r300_fragment_program_compiler *compi _mesa_bzero(code, sizeof(*code)); code->max_temp_idx = 1; - code->inst_offset = 0; code->inst_end = -1; radeonPairProgram(compiler, &pair_handler, compiler); diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_code.h b/src/mesa/drivers/dri/r300/compiler/radeon_code.h index 6f5bc288316..0806fb1b5c6 100644 --- a/src/mesa/drivers/dri/r300/compiler/radeon_code.h +++ b/src/mesa/drivers/dri/r300/compiler/radeon_code.h @@ -160,8 +160,7 @@ struct r500_fragment_program_code { uint32_t inst5; } inst[R500_PFS_MAX_INST]; - int inst_offset; - int inst_end; + int inst_end; /* Number of instructions - 1; also, last instruction to be executed */ int max_temp_idx; }; diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 1ac14267d5e..b868b624960 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -2103,13 +2103,13 @@ static void r500SetupPixelShader(GLcontext *ctx) rmesa->hw.fp.cmd[R500_FP_PIXSIZE] = code->max_temp_idx; rmesa->hw.fp.cmd[R500_FP_CODE_ADDR] = - R500_US_CODE_START_ADDR(code->inst_offset) | + R500_US_CODE_START_ADDR(0) | R500_US_CODE_END_ADDR(code->inst_end); rmesa->hw.fp.cmd[R500_FP_CODE_RANGE] = - R500_US_CODE_RANGE_ADDR(code->inst_offset) | + R500_US_CODE_RANGE_ADDR(0) | R500_US_CODE_RANGE_SIZE(code->inst_end); rmesa->hw.fp.cmd[R500_FP_CODE_OFFSET] = - R500_US_CODE_OFFSET_ADDR(0); /* FIXME when we add flow control */ + R500_US_CODE_OFFSET_ADDR(0); R300_STATECHANGE(rmesa, r500fp); /* Emit our shader... */ |