vc4: Add support for 16-bit signed/unsigned norm/scaled vertex attrs.

[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 f0485d8175e95a00b08de83cfdd74bec96293fb6..f7e63fdb2d4b14faffabb48dd88c58fe59b2971b 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_context.c
+++ b/src/gallium/drivers/freedreno/freedreno_context.c
@@ -28,11 +28,13 @@
 
 #include "freedreno_context.h"
 #include "freedreno_draw.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 struct fd_ringbuffer *next_rb(struct fd_context *ctx)
@@ -98,7 +100,7 @@ fd_context_render(struct pipe_context *pctx)
        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);
 
@@ -109,7 +111,7 @@ 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;
 
@@ -143,7 +145,8 @@ fd_context_destroy(struct pipe_context *pctx)
 
        DBG("");
 
-       util_slab_destroy(&ctx->transfer_pool);
+       fd_prog_fini(pctx);
+       fd_hw_query_fini(pctx);
 
        util_dynarray_fini(&ctx->draw_patches);
 
@@ -153,6 +156,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);
@@ -200,7 +205,7 @@ 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;
        }
@@ -218,6 +223,7 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen,
        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)