winsys/radeon: fold cs_set_flush_callback into cs_create

[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 95f022be8744632a592e05b4befa33a17c8f5650..bd7670d07be0058668a57723ff01d9ad316e76ad 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -65,11 +65,20 @@ static void si_flush_from_st(struct pipe_context *ctx,
                             struct pipe_fence_handle **fence,
                             unsigned flags)
 {
-       si_flush(ctx, fence,
-                flags & PIPE_FLUSH_END_OF_FRAME ? RADEON_FLUSH_END_OF_FRAME : 0);
+       struct si_context *sctx = (struct si_context *)ctx;
+       unsigned rflags = 0;
+
+       if (flags & PIPE_FLUSH_END_OF_FRAME)
+               rflags |= RADEON_FLUSH_END_OF_FRAME;
+
+       if (sctx->b.rings.dma.cs) {
+               sctx->b.rings.dma.flush(sctx, rflags);
+       }
+
+       si_flush(ctx, fence, rflags);
 }
 
-static void si_flush_from_winsys(void *ctx, unsigned flags)
+static void si_flush_gfx_ring(void *ctx, unsigned flags)
 {
        si_flush((struct pipe_context*)ctx, NULL, flags);
 }
@@ -113,6 +122,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void *
 {
        struct si_context *sctx = CALLOC_STRUCT(si_context);
        struct si_screen* sscreen = (struct si_screen *)screen;
+       struct radeon_winsys *ws = sscreen->b.ws;
        int shader, i;
 
        if (sctx == NULL)
@@ -138,8 +148,9 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void *
                sctx->b.b.create_video_buffer = vl_video_buffer_create;
        }
 
-       sctx->b.rings.gfx.cs = sctx->b.ws->cs_create(sctx->b.ws, RING_GFX, NULL);
-       sctx->b.rings.gfx.flush = si_flush_from_winsys;
+       sctx->b.rings.gfx.cs = ws->cs_create(ws, RING_GFX, si_flush_gfx_ring,
+                                            sctx, NULL);
+       sctx->b.rings.gfx.flush = si_flush_gfx_ring;
 
        si_init_all_descriptors(sctx);
 
@@ -148,6 +159,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void *
        sctx->atoms.cache_flush = &sctx->cache_flush;
 
        sctx->atoms.streamout_begin = &sctx->b.streamout.begin_atom;
+       sctx->atoms.streamout_enable = &sctx->b.streamout.enable_atom;
 
        switch (sctx->b.chip_class) {
        case SI:
@@ -160,8 +172,6 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void *
                goto fail;
        }
 
-       sctx->b.ws->cs_set_flush_callback(sctx->b.rings.gfx.cs, si_flush_from_winsys, sctx);
-
        sctx->blitter = util_blitter_create(&sctx->b.b);
        if (sctx->blitter == NULL)
                goto fail;
@@ -257,20 +267,16 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
                return HAVE_LLVM >= 0x0304 && (sscreen->b.chip_class < CIK ||
                                               sscreen->b.info.drm_minor >= 35);
 
-       case PIPE_CAP_TGSI_TEXCOORD:
-               return 0;
-
         case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT:
-                return 64;
+                return R600_MAP_BUFFER_ALIGNMENT;
 
        case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT:
-               return 256;
+       case PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT:
+               return 4;
 
        case PIPE_CAP_GLSL_FEATURE_LEVEL:
                return HAVE_LLVM >= 0x0305 ? 330 : 140;
 
-       case PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT:
-               return 1;
        case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE:
                return MIN2(sscreen->b.info.vram_size, 0xFFFFFFFF);
 
@@ -285,6 +291,9 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_CUBE_MAP_ARRAY:
        case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS:
        case PIPE_CAP_TEXTURE_GATHER_SM5:
+       case PIPE_CAP_TGSI_TEXCOORD:
+       case PIPE_CAP_FAKE_SW_MSAA:
+       case PIPE_CAP_TEXTURE_QUERY_LOD:
                return 0;
 
        case PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK:
@@ -328,9 +337,11 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_QUERY_TIME_ELAPSED:
                return sscreen->b.info.r600_clock_crystal_freq != 0;
 
+       case PIPE_CAP_MIN_TEXTURE_GATHER_OFFSET:
        case PIPE_CAP_MIN_TEXEL_OFFSET:
                return -8;
 
+       case PIPE_CAP_MAX_TEXTURE_GATHER_OFFSET:
        case PIPE_CAP_MAX_TEXEL_OFFSET:
                return 7;
        case PIPE_CAP_ENDIANNESS:
@@ -417,7 +428,7 @@ static void si_destroy_screen(struct pipe_screen* pscreen)
        if (sscreen == NULL)
                return;
 
-       if (!radeon_winsys_unref(sscreen->b.ws))
+       if (!sscreen->b.ws->unref(sscreen->b.ws))
                return;
 
        r600_destroy_common_screen(&sscreen->b);