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

r600g: cleanup magic numbers in set_xx_sampler 

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Marek Olšák 2012-02-21 20:24:34 +01:00
parent 89293287b8
commit 5b84a8c3c3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/r600/evergreen_hw_context.c
View File

@ -820,7 +820,7 @@ void evergreen_context_pipe_state_set_ps_sampler(struct r600_context *ctx, struc
{
unsigned offset;
offset = 0x0003C000 + id * 0xc;
offset = R_03C000_SQ_TEX_SAMPLER_WORD0_0 + 12*id;
r600_context_pipe_state_set_sampler(ctx, state, offset);
evergreen_context_pipe_state_set_sampler_border(ctx, state, R_00A400_TD_PS_SAMPLER0_BORDER_INDEX, id);
}
@ -829,7 +829,7 @@ void evergreen_context_pipe_state_set_vs_sampler(struct r600_context *ctx, struc
{
unsigned offset;
offset = 0x0003C0D8 + id * 0xc;
offset = R_03C000_SQ_TEX_SAMPLER_WORD0_0 + 12*(id + 18);
r600_context_pipe_state_set_sampler(ctx, state, offset);
evergreen_context_pipe_state_set_sampler_border(ctx, state, R_00A414_TD_VS_SAMPLER0_BORDER_INDEX, id);
}

8
src/gallium/drivers/r600/r600_hw_context.c
View File

@ -1059,9 +1059,9 @@ void r600_context_pipe_state_set_ps_sampler(struct r600_context *ctx, struct r60
{
unsigned offset;
offset = 0x0003C000 + id * 0xc;
offset = R_03C000_SQ_TEX_SAMPLER_WORD0_0 + 12*id;
r600_context_pipe_state_set_sampler(ctx, state, offset);
offset = 0x0000A400 + id * 0x10;
offset = R_00A400_TD_PS_SAMPLER0_BORDER_RED + 16*id;
r600_context_pipe_state_set_sampler_border(ctx, state, offset);
}
@ -1069,9 +1069,9 @@ void r600_context_pipe_state_set_vs_sampler(struct r600_context *ctx, struct r60
{
unsigned offset;
offset = 0x0003C0D8 + id * 0xc;
offset = R_03C000_SQ_TEX_SAMPLER_WORD0_0 + 12*(id + 18);
r600_context_pipe_state_set_sampler(ctx, state, offset);
offset = 0x0000A600 + id * 0x10;
offset = R_00A600_TD_VS_SAMPLER0_BORDER_RED + 16*id;
r600_context_pipe_state_set_sampler_border(ctx, state, offset);
}