fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi: switch r600_atom::emit parameter to si_context

Browse source 
Acked-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Marek Olšák 2018-04-01 15:16:26 -04:00
parent 2b70dd8c8a
commit 3de323f9bb
7 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/radeon/r600_pipe_common.h
View file

@ -364,7 +364,7 @@ struct r600_memory_object {
/* This encapsulates a state or an operation which can emitted into the GPU
* command stream. */
struct r600_atom {
void (*emit)(struct r600_common_context *ctx, struct r600_atom *state);
void (*emit)(struct si_context *ctx, struct r600_atom *state);
unsigned short id;
};

18
src/gallium/drivers/radeon/r600_query.c
View file

@ -914,13 +914,13 @@ static void r600_query_hw_emit_stop(struct r600_common_context *ctx,
si_update_prims_generated_query_state((void*)ctx, query->b.type, -1);
}
static void emit_set_predicate(struct r600_common_context *ctx,
static void emit_set_predicate(struct si_context *ctx,
struct r600_resource *buf, uint64_t va,
uint32_t op)
{
struct radeon_winsys_cs *cs = ctx->gfx_cs;
struct radeon_winsys_cs *cs = ctx->b.gfx_cs;
if (ctx->chip_class >= GFX9) {
if (ctx->b.chip_class >= GFX9) {
radeon_emit(cs, PKT3(PKT3_SET_PREDICATION, 2, 0));
radeon_emit(cs, op);
radeon_emit(cs, va);
@ -930,14 +930,14 @@ static void emit_set_predicate(struct r600_common_context *ctx,
radeon_emit(cs, va);
radeon_emit(cs, op | ((va >> 32) & 0xFF));
}
radeon_add_to_buffer_list(ctx, ctx->gfx_cs, buf, RADEON_USAGE_READ,
radeon_add_to_buffer_list(&ctx->b, ctx->b.gfx_cs, buf, RADEON_USAGE_READ,
RADEON_PRIO_QUERY);
}
static void r600_emit_query_predication(struct r600_common_context *ctx,
static void r600_emit_query_predication(struct si_context *ctx,
struct r600_atom *atom)
{
struct r600_query_hw *query = (struct r600_query_hw *)ctx->render_cond;
struct r600_query_hw *query = (struct r600_query_hw *)ctx->b.render_cond;
struct r600_query_buffer *qbuf;
uint32_t op;
bool flag_wait, invert;
@ -945,9 +945,9 @@ static void r600_emit_query_predication(struct r600_common_context *ctx,
if (!query)
return;
invert = ctx->render_cond_invert;
flag_wait = ctx->render_cond_mode == PIPE_RENDER_COND_WAIT ||
ctx->render_cond_mode == PIPE_RENDER_COND_BY_REGION_WAIT;
invert = ctx->b.render_cond_invert;
flag_wait = ctx->b.render_cond_mode == PIPE_RENDER_COND_WAIT ||
ctx->b.render_cond_mode == PIPE_RENDER_COND_BY_REGION_WAIT;
if (query->workaround_buf) {
op = PRED_OP(PREDICATION_OP_BOOL64);

2
src/gallium/drivers/radeonsi/si_compute.c
View file

@ -865,7 +865,7 @@ static void si_launch_grid(
si_emit_compute_shader_pointers(sctx);
if (si_is_atom_dirty(sctx, sctx->atoms.s.render_cond)) {
sctx->atoms.s.render_cond->emit(&sctx->b,
sctx->atoms.s.render_cond->emit(sctx,
sctx->atoms.s.render_cond);
si_set_atom_dirty(sctx, sctx->atoms.s.render_cond, false);
}

2
src/gallium/drivers/radeonsi/si_state.c
View file

@ -48,7 +48,7 @@ void si_init_atom(struct si_context *sctx, struct r600_atom *atom,
struct r600_atom **list_elem,
void (*emit_func)(struct si_context *ctx, struct r600_atom *state))
{
atom->emit = (void*)emit_func;
atom->emit = emit_func;
atom->id = list_elem - sctx->atoms.array;
*list_elem = atom;
}

6
src/gallium/drivers/radeonsi/si_state_draw.c
View file

@ -1184,7 +1184,7 @@ static void si_emit_all_states(struct si_context *sctx, const struct pipe_draw_i
while (mask) {
struct r600_atom *atom = sctx->atoms.array[u_bit_scan(&mask)];
atom->emit(&sctx->b, atom);
atom->emit(sctx, atom);
}
sctx->dirty_atoms &= skip_atom_mask;
@ -1451,9 +1451,9 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
/* Set shader pointers after descriptors are uploaded. */
if (si_is_atom_dirty(sctx, shader_pointers))
shader_pointers->emit(&sctx->b, NULL);
shader_pointers->emit(sctx, NULL);
if (si_is_atom_dirty(sctx, &sctx->b.render_cond_atom))
sctx->b.render_cond_atom.emit(&sctx->b, NULL);
sctx->b.render_cond_atom.emit(sctx, NULL);
sctx->dirty_atoms = 0;
si_emit_draw_packets(sctx, info, indexbuf, index_size, index_offset);

7
src/gallium/drivers/radeonsi/si_state_streamout.c
View file

@ -255,9 +255,8 @@ static void si_flush_vgt_streamout(struct si_context *sctx)
radeon_emit(cs, 4); /* poll interval */
}
static void si_emit_streamout_begin(struct r600_common_context *rctx, struct r600_atom *atom)
static void si_emit_streamout_begin(struct si_context *sctx, struct r600_atom *atom)
{
struct si_context *sctx = (struct si_context*)rctx;
struct radeon_winsys_cs *cs = sctx->b.gfx_cs;
struct si_streamout_target **t = sctx->streamout.targets;
uint16_t *stride_in_dw = sctx->streamout.stride_in_dw;
@ -358,11 +357,9 @@ void si_emit_streamout_end(struct si_context *sctx)
* are no buffers bound.
*/
static void si_emit_streamout_enable(struct r600_common_context *rctx,
static void si_emit_streamout_enable(struct si_context *sctx,
struct r600_atom *atom)
{
struct si_context *sctx = (struct si_context*)rctx;
radeon_set_context_reg_seq(sctx->b.gfx_cs, R_028B94_VGT_STRMOUT_CONFIG, 2);
radeon_emit(sctx->b.gfx_cs,
S_028B94_STREAMOUT_0_EN(si_get_strmout_en(sctx)) |

6
src/gallium/drivers/radeonsi/si_state_viewport.c
View file

@ -211,9 +211,8 @@ static void si_emit_guardband(struct si_context *ctx,
radeon_emit(cs, fui(discard_x)); /* R_028BF4_PA_CL_GB_HORZ_DISC_ADJ */
}
static void si_emit_scissors(struct r600_common_context *rctx, struct r600_atom *atom)
static void si_emit_scissors(struct si_context *ctx, struct r600_atom *atom)
{
struct si_context *ctx = (struct si_context *)rctx;
struct radeon_winsys_cs *cs = ctx->b.gfx_cs;
struct pipe_scissor_state *states = ctx->scissors.states;
unsigned mask = ctx->scissors.dirty_mask;
@ -384,10 +383,9 @@ static void si_emit_depth_ranges(struct si_context *ctx)
ctx->viewports.depth_range_dirty_mask = 0;
}
static void si_emit_viewport_states(struct r600_common_context *rctx,
static void si_emit_viewport_states(struct si_context *ctx,
struct r600_atom *atom)
{
struct si_context *ctx = (struct si_context *)rctx;
si_emit_viewports(ctx);
si_emit_depth_ranges(ctx);
}