fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 22:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r500: the cs is shared per context - doh so don't use for program upload.

Browse source 
Also remove some unused bits of the r500 fragprog struct
This commit is contained in:
Dave Airlie 2008-05-27 18:15:14 +10:00
parent 7278266612
commit eee53dfb22
3 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/drivers/dri/r300/r300_context.h
View file

@ -814,16 +814,6 @@ struct r500_fragment_program {
} inst[512];
/* TODO: This is magic! */
struct {
int tex_offset;
int tex_end;
int alu_offset;
int alu_end;
int flags;
} node[4];
int cur_node;
int first_node_has_tex;
int temp_reg_offset;
int inst_offset;

5
src/mesa/drivers/dri/r300/r300_state.c
View file

@ -2538,7 +2538,7 @@ static void r500SetupPixelShader(r300ContextPtr rmesa)
R300_STATECHANGE(rmesa, r500fp);
/* Emit our shader... */
for (i = 0; i < fp->cs->nrslots; i++) {
for (i = 0; i < fp->inst_end+1; i++) {
rmesa->hw.r500fp.cmd[i*6+1] = fp->inst[i].inst0;
rmesa->hw.r500fp.cmd[i*6+2] = fp->inst[i].inst1;
rmesa->hw.r500fp.cmd[i*6+3] = fp->inst[i].inst2;
@ -2547,8 +2547,7 @@ static void r500SetupPixelShader(r300ContextPtr rmesa)
rmesa->hw.r500fp.cmd[i*6+6] = fp->inst[i].inst5;
}
bump_r500fp_count(rmesa->hw.r500fp.cmd, fp->cs->nrslots * 6);
bump_r500fp_count(rmesa->hw.r500fp.cmd, (fp->inst_end + 1) * 6);
R300_STATECHANGE(rmesa, r500fp_const);
for (i = 0; i < fp->const_nr; i++) {

7
src/mesa/drivers/dri/r300/r500_fragprog.c
View file

@ -1191,15 +1191,11 @@ static void init_program(r300ContextPtr r300, struct r500_fragment_program *fp)
fp->translated = GL_FALSE;
fp->error = GL_FALSE;
fp->cs = cs = &(R300_CONTEXT(fp->ctx)->state.pfs_compile);
fp->cur_node = 0;
fp->first_node_has_tex = 0;
fp->const_nr = 0;
/* Size of pixel stack, plus 1. */
fp->max_temp_idx = 1;
/* Temp register offset. */
fp->temp_reg_offset = 0;
fp->node[0].alu_end = -1;
fp->node[0].tex_end = -1;
_mesa_memset(cs, 0, sizeof(*fp->cs));
for (i = 0; i < PFS_MAX_ALU_INST; i++) {
@ -1402,9 +1398,6 @@ void r500TranslateFragmentShader(r300ContextPtr r300,
r300UpdateStateParameters(fp->ctx, _NEW_PROGRAM);
} else {
fp->inst_offset = 0;
fp->inst_end = fp->cs->nrslots - 1;
}
update_params(fp);