radeonsi: simplify setting the DONE bit for PS exports

[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 e65379993f7c5ac4e2d35ea43bec6bfb5ecae383..79bbc48d1f4c003a4b468047dad404d9e22211af 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -50,6 +50,8 @@ static void si_destroy_context(struct pipe_context *context)
        sctx->b.ws->fence_reference(&sctx->last_gfx_fence, NULL);
 
        si_pm4_free_state(sctx, sctx->init_config, ~0);
+       if (sctx->init_config_gs_rings)
+               si_pm4_free_state(sctx, sctx->init_config_gs_rings, ~0);
        for (i = 0; i < Elements(sctx->vgt_shader_config); i++)
                si_pm4_delete_state(sctx, vgt_shader_config, sctx->vgt_shader_config[i]);
 
@@ -107,7 +109,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
 #endif
        int shader, i;
 
-       if (sctx == NULL)
+       if (!sctx)
                return NULL;
 
        if (sscreen->b.debug_flags & DBG_CHECK_VM)
@@ -139,10 +141,10 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
                sctx->b.b.create_video_buffer = vl_video_buffer_create;
        }
 
-       sctx->b.rings.gfx.cs = ws->cs_create(sctx->b.ctx, RING_GFX, si_context_gfx_flush,
-                                            sctx, sscreen->b.trace_bo ?
-                                               sscreen->b.trace_bo->cs_buf : NULL);
-       sctx->b.rings.gfx.flush = si_context_gfx_flush;
+       sctx->b.gfx.cs = ws->cs_create(sctx->b.ctx, RING_GFX, si_context_gfx_flush,
+                                      sctx, sscreen->b.trace_bo ?
+                                              sscreen->b.trace_bo->buf : NULL);
+       sctx->b.gfx.flush = si_context_gfx_flush;
 
        /* Border colors. */
        sctx->border_color_table = malloc(SI_MAX_BORDER_COLORS *
@@ -158,7 +160,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
                goto fail;
 
        sctx->border_color_map =
-               ws->buffer_map(sctx->border_color_buffer->cs_buf,
+               ws->buffer_map(sctx->border_color_buffer->buf,
                               NULL, PIPE_TRANSFER_WRITE);
        if (!sctx->border_color_map)
                goto fail;
@@ -298,6 +300,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_TEXTURE_GATHER_SM5:
        case PIPE_CAP_TGSI_TXQS:
        case PIPE_CAP_FORCE_PERSAMPLE_INTERP:
+       case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS:
                return 1;
 
        case PIPE_CAP_RESOURCE_FROM_USER_MEMORY:
@@ -336,6 +339,9 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_FAKE_SW_MSAA:
        case PIPE_CAP_TEXTURE_GATHER_OFFSETS:
        case PIPE_CAP_VERTEXID_NOBASE:
+       case PIPE_CAP_CLEAR_TEXTURE:
+       case PIPE_CAP_DRAW_PARAMETERS:
+       case PIPE_CAP_TGSI_PACK_HALF_FLOAT:
                return 0;
 
        case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS:
@@ -516,7 +522,7 @@ static void si_destroy_screen(struct pipe_screen* pscreen)
 {
        struct si_screen *sscreen = (struct si_screen *)pscreen;
 
-       if (sscreen == NULL)
+       if (!sscreen)
                return;
 
        if (!sscreen->b.ws->unref(sscreen->b.ws))
@@ -586,6 +592,7 @@ static bool si_init_gs_info(struct si_screen *sscreen)
        case CHIP_MULLINS:
        case CHIP_ICELAND:
        case CHIP_CARRIZO:
+       case CHIP_STONEY:
                sscreen->gs_table_depth = 16;
                return true;
        case CHIP_TAHITI:
@@ -606,7 +613,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws)
 {
        struct si_screen *sscreen = CALLOC_STRUCT(si_screen);
 
-       if (sscreen == NULL) {
+       if (!sscreen) {
                return NULL;
        }
 
@@ -625,6 +632,9 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws)
                return NULL;
        }
 
+       if (!debug_get_bool_option("RADEON_DISABLE_PERFCOUNTERS", FALSE))
+               si_init_perfcounters(sscreen);
+
        sscreen->b.has_cp_dma = true;
        sscreen->b.has_streamout = true;