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

r600g: remove duplicated evergreen_context_ps_partial_flush 

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:58:09 +01:00
parent 84db8f9a22
commit 89293287b8
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -774,19 +774,6 @@ out_err:
return r;
}
static inline void evergreen_context_ps_partial_flush(struct r600_context *ctx)
{
struct radeon_winsys_cs *cs = ctx->cs;
if (!(ctx->flags & R600_CONTEXT_DRAW_PENDING))
return;
cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_PS_PARTIAL_FLUSH) | EVENT_INDEX(4);
ctx->flags &= ~R600_CONTEXT_DRAW_PENDING;
}
static inline void evergreen_context_pipe_state_set_sampler_border(struct r600_context *ctx, struct r600_pipe_state *state, unsigned offset, unsigned id)
{
unsigned fake_offset = (offset - R_00A400_TD_PS_SAMPLER0_BORDER_INDEX) * 0x100 + 0x40000 + id * 0x1C;
@ -824,7 +811,7 @@ static inline void evergreen_context_pipe_state_set_sampler_border(struct r600_c
* registers, or previous draw commands that haven't completed yet
* will end up using the new border color. */
if (dirty & R600_BLOCK_STATUS_DIRTY)
evergreen_context_ps_partial_flush(ctx);
r600_context_ps_partial_flush(ctx);
if (dirty)
r600_context_dirty_block(ctx, block, dirty, 4);
}

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

@ -112,7 +112,7 @@ err:
return;
}
static inline void r600_context_ps_partial_flush(struct r600_context *ctx)
void r600_context_ps_partial_flush(struct r600_context *ctx)
{
struct radeon_winsys_cs *cs = ctx->cs;

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

@ -65,6 +65,7 @@ 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_state_sampler_init(struct r600_context *ctx, uint32_t offset);
void r600_context_pipe_state_set_sampler(struct r600_context *ctx, struct r600_pipe_state *state, unsigned offset);
void r600_context_ps_partial_flush(struct r600_context *ctx);
/*
* evergreen_hw_context.c