KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <nhaehnle@gmail.com>
This commit is contained in:
Nicolai Hähnle 2009-07-30 22:26:02 +02:00
parent 9f26f801dc
commit cab62aa28f
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c
View File

@ -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);

3
src/mesa/drivers/dri/r300/compiler/radeon_code.h
View File

@ -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;
};

6
src/mesa/drivers/dri/r300/r300_state.c
View File

@ -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... */