radeonsi: remove r600_common_context

[mesa.git] / src / gallium / drivers / radeonsi / si_pm4.c

diff --git a/src/gallium/drivers/radeonsi/si_pm4.c b/src/gallium/drivers/radeonsi/si_pm4.c
index a05cc25c05c14ab5f2e60d3c4c25da6d303a1f31..d68a38375f5486b17af34280fdeb84de3a82b91f 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pm4.c
+++ b/src/gallium/drivers/radeonsi/si_pm4.c
@@ -123,10 +123,10 @@ void si_pm4_free_state(struct si_context *sctx,
 
 void si_pm4_emit(struct si_context *sctx, struct si_pm4_state *state)
 {
-       struct radeon_winsys_cs *cs = sctx->b.gfx_cs;
+       struct radeon_winsys_cs *cs = sctx->gfx_cs;
 
        for (int i = 0; i < state->nbo; ++i) {
-               radeon_add_to_buffer_list(sctx, sctx->b.gfx_cs, state->bo[i],
+               radeon_add_to_buffer_list(sctx, sctx->gfx_cs, state->bo[i],
                                      state->bo_usage[i], state->bo_priority[i]);
        }
 
@@ -135,7 +135,7 @@ void si_pm4_emit(struct si_context *sctx, struct si_pm4_state *state)
        } else {
                struct r600_resource *ib = state->indirect_buffer;
 
-               radeon_add_to_buffer_list(sctx, sctx->b.gfx_cs, ib,
+               radeon_add_to_buffer_list(sctx, sctx->gfx_cs, ib,
                                          RADEON_USAGE_READ,
                                           RADEON_PRIO_IB2);
 
@@ -155,11 +155,11 @@ void si_pm4_reset_emitted(struct si_context *sctx)
 void si_pm4_upload_indirect_buffer(struct si_context *sctx,
                                   struct si_pm4_state *state)
 {
-       struct pipe_screen *screen = sctx->b.b.screen;
+       struct pipe_screen *screen = sctx->b.screen;
        unsigned aligned_ndw = align(state->ndw, 8);
 
        /* only supported on CIK and later */
-       if (sctx->b.chip_class < CIK)
+       if (sctx->chip_class < CIK)
                return;
 
        assert(state->ndw);
@@ -183,6 +183,6 @@ void si_pm4_upload_indirect_buffer(struct si_context *sctx,
                        state->pm4[i] = 0xffff1000; /* type3 nop packet */
        }
 
-       pipe_buffer_write(&sctx->b.b, &state->indirect_buffer->b.b,
+       pipe_buffer_write(&sctx->b, &state->indirect_buffer->b.b,
                          0, aligned_ndw *4, state->pm4);
 }