fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 02:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g: remove duplicated function r600_state_sampler_init

Browse source 
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 19:40:22 +01:00
parent cf59ed3f23
commit 985bd5487e
3 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gallium/drivers/r600/evergreen_hw_context.c
View file

@ -648,22 +648,6 @@ static int evergreen_resource_range_init(struct r600_context *ctx, struct r600_r
return r600_resource_init(ctx, range, offset, nblocks, stride, r600_shader_resource, nreg, EVERGREEN_RESOURCE_OFFSET); return r600_resource_init(ctx, range, offset, nblocks, stride, r600_shader_resource, nreg, EVERGREEN_RESOURCE_OFFSET);
} }
/* SHADER SAMPLER R600/R700 */
static int r600_state_sampler_init(struct r600_context *ctx, uint32_t offset)
{
struct r600_reg r600_shader_sampler[] = {
{R_03C000_SQ_TEX_SAMPLER_WORD0_0, 0, 0},
{R_03C004_SQ_TEX_SAMPLER_WORD1_0, 0, 0},
{R_03C008_SQ_TEX_SAMPLER_WORD2_0, 0, 0},
};
unsigned nreg = Elements(r600_shader_sampler);
for (int i = 0; i < nreg; i++) {
r600_shader_sampler[i].offset += offset;
}
return r600_context_add_block(ctx, r600_shader_sampler, nreg, PKT3_SET_SAMPLER, EVERGREEN_SAMPLER_OFFSET);
}
/* SHADER SAMPLER BORDER EG/CM */ /* SHADER SAMPLER BORDER EG/CM */
static int evergreen_state_sampler_border_init(struct r600_context *ctx, uint32_t offset, unsigned id) static int evergreen_state_sampler_border_init(struct r600_context *ctx, uint32_t offset, unsigned id)
{ {

4
src/gallium/drivers/r600/r600_hw_context.c
View file

@ -574,8 +574,8 @@ static int r600_resource_range_init(struct r600_context *ctx, struct r600_range
return r600_resource_init(ctx, range, offset, nblocks, stride, r600_shader_resource, nreg, R600_RESOURCE_OFFSET); return r600_resource_init(ctx, range, offset, nblocks, stride, r600_shader_resource, nreg, R600_RESOURCE_OFFSET);
} }
/* SHADER SAMPLER R600/R700 */ /* SHADER SAMPLER R600/R700/EG/CM */
static int r600_state_sampler_init(struct r600_context *ctx, uint32_t offset) int r600_state_sampler_init(struct r600_context *ctx, uint32_t offset)
{ {
struct r600_reg r600_shader_sampler[] = { struct r600_reg r600_shader_sampler[] = {
{R_03C000_SQ_TEX_SAMPLER_WORD0_0, 0, 0}, {R_03C000_SQ_TEX_SAMPLER_WORD0_0, 0, 0},

1
src/gallium/drivers/r600/r600_hw_context_priv.h
View file

@ -63,6 +63,7 @@ void r600_context_dirty_block(struct r600_context *ctx, struct r600_block *block
int dirty, int index); int dirty, int index);
int r600_setup_block_table(struct r600_context *ctx); int r600_setup_block_table(struct r600_context *ctx);
int r600_resource_init(struct r600_context *ctx, struct r600_range *range, unsigned offset, unsigned nblocks, unsigned stride, struct r600_reg *reg, int nreg, unsigned offset_base); int r600_resource_init(struct r600_context *ctx, struct r600_range *range, unsigned offset, unsigned nblocks, unsigned stride, struct r600_reg *reg, int nreg, unsigned offset_base);
int r600_state_sampler_init(struct r600_context *ctx, uint32_t offset);
/* /*
* evergreen_hw_context.c * evergreen_hw_context.c