radeonsi: rename si_begin_new_cs -> si_begin_new_gfx_cs

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

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 1cc08c5feedb9642d0565f805c69c08841c6f8b8..21b97437618a8b42c87ae0c1505172ee0be9b1ae 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -88,6 +88,7 @@ static const struct debug_named_value debug_options[] = {
        { "nodccfb", DBG(NO_DCC_FB), "Disable separate DCC on the main framebuffer" },
        { "nodccmsaa", DBG(NO_DCC_MSAA), "Disable DCC for MSAA" },
        { "dccmsaa", DBG(DCC_MSAA), "Enable DCC for MSAA" },
+       { "nofmask", DBG(NO_FMASK), "Disable MSAA compression" },
 
        /* Tests: */
        { "testdma", DBG(TEST_DMA), "Invoke SDMA tests and exit." },
@@ -258,7 +259,6 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        sctx->b.b.emit_string_marker = si_emit_string_marker;
        sctx->b.b.set_debug_callback = si_set_debug_callback;
        sctx->b.b.set_log_context = si_set_log_context;
-       sctx->b.set_atom_dirty = (void *)si_set_atom_dirty;
        sctx->screen = sscreen; /* Easy accessing of screen/winsys. */
        sctx->is_debug = (flags & PIPE_CONTEXT_DEBUG) != 0;
 
@@ -286,8 +286,8 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        }
 
        sctx->b.gfx.cs = ws->cs_create(sctx->b.ctx, RING_GFX,
-                                      si_context_gfx_flush, sctx);
-       sctx->b.gfx.flush = si_context_gfx_flush;
+                                      si_flush_gfx_cs, sctx);
+       sctx->b.gfx.flush = si_flush_gfx_cs;
 
        /* Border colors. */
        sctx->border_color_table = malloc(SI_MAX_BORDER_COLORS *
@@ -332,7 +332,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        sctx->sample_mask.sample_mask = 0xffff;
 
        /* these must be last */
-       si_begin_new_cs(sctx);
+       si_begin_new_gfx_cs(sctx);
 
        if (sctx->b.chip_class >= GFX9) {
                sctx->wait_mem_scratch = (struct r600_resource*)