freedreno: add core infrastructure support for MRTs

[mesa.git] / src / gallium / drivers / freedreno / freedreno_context.c

diff --git a/src/gallium/drivers/freedreno/freedreno_context.c b/src/gallium/drivers/freedreno/freedreno_context.c
index c959ccfcc898aa79756f3dc588dae9dbdaaa3018..bb1b52797a85f82cc7a5d4e50d142a954ba8b46e 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_context.c
+++ b/src/gallium/drivers/freedreno/freedreno_context.c
@@ -28,22 +28,21 @@
 
 #include "freedreno_context.h"
 #include "freedreno_draw.h"
+#include "freedreno_fence.h"
+#include "freedreno_program.h"
 #include "freedreno_resource.h"
 #include "freedreno_texture.h"
 #include "freedreno_state.h"
 #include "freedreno_gmem.h"
+#include "freedreno_query.h"
+#include "freedreno_query_hw.h"
 #include "freedreno_util.h"
 
-static void
-fd_context_next_rb(struct pipe_context *pctx)
+static struct fd_ringbuffer *next_rb(struct fd_context *ctx)
 {
-       struct fd_context *ctx = fd_context(pctx);
        struct fd_ringbuffer *ring;
        uint32_t ts;
 
-       fd_ringmarker_del(ctx->draw_start);
-       fd_ringmarker_del(ctx->draw_end);
-
        /* grab next ringbuffer: */
        ring = ctx->rings[(ctx->rings_idx++) % ARRAY_SIZE(ctx->rings)];
 
@@ -56,10 +55,36 @@ fd_context_next_rb(struct pipe_context *pctx)
 
        fd_ringbuffer_reset(ring);
 
+       return ring;
+}
+
+static void
+fd_context_next_rb(struct pipe_context *pctx)
+{
+       struct fd_context *ctx = fd_context(pctx);
+       struct fd_ringbuffer *ring;
+
+       fd_ringmarker_del(ctx->draw_start);
+       fd_ringmarker_del(ctx->draw_end);
+
+       ring = next_rb(ctx);
+
        ctx->draw_start = fd_ringmarker_new(ring);
        ctx->draw_end = fd_ringmarker_new(ring);
 
+       fd_ringbuffer_set_parent(ring, NULL);
        ctx->ring = ring;
+
+       fd_ringmarker_del(ctx->binning_start);
+       fd_ringmarker_del(ctx->binning_end);
+
+       ring = next_rb(ctx);
+
+       ctx->binning_start = fd_ringmarker_new(ring);
+       ctx->binning_end = fd_ringmarker_new(ring);
+
+       fd_ringbuffer_set_parent(ring, ctx->ring);
+       ctx->binning_ring = ring;
 }
 
 /* emit accumulated render cmds, needed for example if render target has
@@ -70,13 +95,14 @@ fd_context_render(struct pipe_context *pctx)
 {
        struct fd_context *ctx = fd_context(pctx);
        struct pipe_framebuffer_state *pfb = &ctx->framebuffer;
+       int i;
 
        DBG("needs_flush: %d", ctx->needs_flush);
 
        if (!ctx->needs_flush)
                return;
 
-       fd_gmem_render_tiles(pctx);
+       fd_gmem_render_tiles(ctx);
 
        DBG("%p/%p/%p", ctx->ring->start, ctx->ring->cur, ctx->ring->end);
 
@@ -87,12 +113,13 @@ fd_context_render(struct pipe_context *pctx)
                fd_context_next_rb(pctx);
 
        ctx->needs_flush = false;
-       ctx->cleared = ctx->restore = ctx->resolve = 0;
+       ctx->cleared = ctx->partial_cleared = ctx->restore = ctx->resolve = 0;
        ctx->gmem_reason = 0;
        ctx->num_draws = 0;
 
-       if (pfb->cbufs[0])
-               fd_resource(pfb->cbufs[0]->texture)->dirty = false;
+       for (i = 0; i < pfb->nr_cbufs; i++)
+               if (pfb->cbufs[i])
+                       fd_resource(pfb->cbufs[i]->texture)->dirty = false;
        if (pfb->zsbuf)
                fd_resource(pfb->zsbuf->texture)->dirty = false;
 }
@@ -101,16 +128,10 @@ static void
 fd_context_flush(struct pipe_context *pctx, struct pipe_fence_handle **fence,
                unsigned flags)
 {
-       DBG("fence=%p", fence);
-
-#if 0
-       if (fence) {
-               fd_fence_ref(ctx->screen->fence.current,
-                               (struct fd_fence **)fence);
-       }
-#endif
-
        fd_context_render(pctx);
+
+       if (fence)
+               *fence = fd_fence_create(pctx);
 }
 
 void
@@ -121,15 +142,26 @@ fd_context_destroy(struct pipe_context *pctx)
 
        DBG("");
 
+       fd_prog_fini(pctx);
+       fd_hw_query_fini(pctx);
+
+       util_dynarray_fini(&ctx->draw_patches);
+
        if (ctx->blitter)
                util_blitter_destroy(ctx->blitter);
 
        if (ctx->primconvert)
                util_primconvert_destroy(ctx->primconvert);
 
+       util_slab_destroy(&ctx->transfer_pool);
+
        fd_ringmarker_del(ctx->draw_start);
        fd_ringmarker_del(ctx->draw_end);
-       fd_ringbuffer_del(ctx->ring);
+       fd_ringmarker_del(ctx->binning_start);
+       fd_ringmarker_del(ctx->binning_end);
+
+       for (i = 0; i < ARRAY_SIZE(ctx->rings); i++)
+               fd_ringbuffer_del(ctx->rings[i]);
 
        for (i = 0; i < ARRAY_SIZE(ctx->pipe); i++) {
                struct fd_vsc_pipe *pipe = &ctx->pipe[i];
@@ -138,6 +170,8 @@ fd_context_destroy(struct pipe_context *pctx)
                fd_bo_del(pipe->bo);
        }
 
+       fd_device_del(ctx->dev);
+
        FREE(ctx);
 }
 
@@ -168,20 +202,25 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen,
        pctx->flush = fd_context_flush;
 
        for (i = 0; i < ARRAY_SIZE(ctx->rings); i++) {
-               ctx->rings[i] = fd_ringbuffer_new(screen->pipe, 0x400000);
+               ctx->rings[i] = fd_ringbuffer_new(screen->pipe, 0x100000);
                if (!ctx->rings[i])
                        goto fail;
        }
 
        fd_context_next_rb(pctx);
+       fd_reset_wfi(ctx);
+
+       util_dynarray_init(&ctx->draw_patches);
 
        util_slab_create(&ctx->transfer_pool, sizeof(struct pipe_transfer),
                        16, UTIL_SLAB_SINGLETHREADED);
 
        fd_draw_init(pctx);
        fd_resource_context_init(pctx);
+       fd_query_context_init(pctx);
        fd_texture_init(pctx);
        fd_state_init(pctx);
+       fd_hw_query_init(pctx);
 
        ctx->blitter = util_blitter_create(pctx);
        if (!ctx->blitter)