freedreno: add resource tracking support for written buffers

[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 496a422709937d2584eb9c4786fbafee2019cd2f..02613dcdbdb5fb284f5c935b5169dc01fab78056 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_context.c
+++ b/src/gallium/drivers/freedreno/freedreno_context.c
@@ -28,6 +28,7 @@
 
 #include "freedreno_context.h"
 #include "freedreno_draw.h"
+#include "freedreno_fence.h"
 #include "freedreno_program.h"
 #include "freedreno_resource.h"
 #include "freedreno_texture.h"
@@ -94,13 +95,15 @@ fd_context_render(struct pipe_context *pctx)
 {
        struct fd_context *ctx = fd_context(pctx);
        struct pipe_framebuffer_state *pfb = &ctx->framebuffer;
+       struct fd_resource *rsc, *rsc_tmp;
+       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);
 
@@ -111,30 +114,41 @@ 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;
-       if (pfb->zsbuf)
-               fd_resource(pfb->zsbuf->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) {
+               rsc = fd_resource(pfb->zsbuf->texture);
+               rsc->dirty = false;
+               if (rsc->stencil)
+                       rsc->stencil->dirty = false;
+       }
+
+       /* go through all the used resources and clear their reading flag */
+       LIST_FOR_EACH_ENTRY_SAFE(rsc, rsc_tmp, &ctx->used_resources, list) {
+               assert(rsc->reading || rsc->writing);
+               rsc->reading = false;
+               rsc->writing = false;
+               list_delinit(&rsc->list);
+       }
+
+       assert(LIST_IS_EMPTY(&ctx->used_resources));
 }
 
 static void
 fd_context_flush(struct pipe_context *pctx, struct pipe_fence_handle **fence,
                unsigned flags)
 {
-       DBG("fence=%p", fence);
+       fd_context_render(pctx);
 
-#if 0
        if (fence) {
-               fd_fence_ref(ctx->screen->fence.current,
-                               (struct fd_fence **)fence);
+               fd_screen_fence_ref(pctx->screen, fence, NULL);
+               *fence = fd_fence_create(pctx);
        }
-#endif
-
-       fd_context_render(pctx);
 }
 
 void
@@ -148,8 +162,6 @@ fd_context_destroy(struct pipe_context *pctx)
        fd_prog_fini(pctx);
        fd_hw_query_fini(pctx);
 
-       util_slab_destroy(&ctx->transfer_pool);
-
        util_dynarray_fini(&ctx->draw_patches);
 
        if (ctx->blitter)
@@ -158,6 +170,8 @@ fd_context_destroy(struct pipe_context *pctx)
        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_ringmarker_del(ctx->binning_start);
@@ -215,7 +229,7 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen,
 
        util_dynarray_init(&ctx->draw_patches);
 
-       util_slab_create(&ctx->transfer_pool, sizeof(struct pipe_transfer),
+       util_slab_create(&ctx->transfer_pool, sizeof(struct fd_transfer),
                        16, UTIL_SLAB_SINGLETHREADED);
 
        fd_draw_init(pctx);