freedreno/layout: layout simplifications and pitch from level 0 pitch

[mesa.git] / src / gallium / drivers / freedreno / a3xx / fd3_context.c

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_context.c b/src/gallium/drivers/freedreno/a3xx/fd3_context.c
index 847414ac08270c92a7fd37c6b00f69373cd755b2..878f67afba03429507da7325768564dde5d1df03 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_context.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_context.c
@@ -1,5 +1,3 @@
-/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
-
 /*
  * Copyright (C) 2013 Rob Clark <robclark@freedesktop.org>
  *
@@ -26,6 +24,7 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
+#include "freedreno_query_hw.h"
 
 #include "fd3_context.h"
 #include "fd3_blend.h"
@@ -43,57 +42,34 @@ fd3_context_destroy(struct pipe_context *pctx)
 {
        struct fd3_context *fd3_ctx = fd3_context(fd_context(pctx));
 
-       util_dynarray_fini(&fd3_ctx->rbrc_patches);
+       u_upload_destroy(fd3_ctx->border_color_uploader);
+
+       fd_context_destroy(pctx);
 
        fd_bo_del(fd3_ctx->vs_pvt_mem);
        fd_bo_del(fd3_ctx->fs_pvt_mem);
        fd_bo_del(fd3_ctx->vsc_size_mem);
 
-       pipe_resource_reference(&fd3_ctx->solid_vbuf, NULL);
-       pipe_resource_reference(&fd3_ctx->blit_texcoord_vbuf, NULL);
-
-       fd_context_destroy(pctx);
-}
-
-/* TODO we could combine a few of these small buffers (solid_vbuf,
- * blit_texcoord_vbuf, and vsc_size_mem, into a single buffer and
- * save a tiny bit of memory
- */
+       fd_context_cleanup_common_vbos(&fd3_ctx->base);
 
-static struct pipe_resource *
-create_solid_vertexbuf(struct pipe_context *pctx)
-{
-       static const float init_shader_const[] = {
-                       -1.000000, +1.000000, +1.000000,
-                       +1.000000, -1.000000, +1.000000,
-       };
-       struct pipe_resource *prsc = pipe_buffer_create(pctx->screen,
-                       PIPE_BIND_CUSTOM, PIPE_USAGE_IMMUTABLE, sizeof(init_shader_const));
-       pipe_buffer_write(pctx, prsc, 0,
-                       sizeof(init_shader_const), init_shader_const);
-       return prsc;
-}
+       fd_hw_query_fini(pctx);
 
-static struct pipe_resource *
-create_blit_texcoord_vertexbuf(struct pipe_context *pctx)
-{
-       struct pipe_resource *prsc = pipe_buffer_create(pctx->screen,
-                       PIPE_BIND_CUSTOM, PIPE_USAGE_DYNAMIC, 16);
-       return prsc;
+       free(fd3_ctx);
 }
 
-static const uint8_t primtypes[PIPE_PRIM_MAX] = {
-               [PIPE_PRIM_POINTS]         = DI_PT_POINTLIST_A3XX,
+static const uint8_t primtypes[] = {
+               [PIPE_PRIM_POINTS]         = DI_PT_POINTLIST,
                [PIPE_PRIM_LINES]          = DI_PT_LINELIST,
                [PIPE_PRIM_LINE_STRIP]     = DI_PT_LINESTRIP,
                [PIPE_PRIM_LINE_LOOP]      = DI_PT_LINELOOP,
                [PIPE_PRIM_TRIANGLES]      = DI_PT_TRILIST,
                [PIPE_PRIM_TRIANGLE_STRIP] = DI_PT_TRISTRIP,
                [PIPE_PRIM_TRIANGLE_FAN]   = DI_PT_TRIFAN,
+               [PIPE_PRIM_MAX]            = DI_PT_RECTLIST,  /* internal clear blits */
 };
 
 struct pipe_context *
-fd3_context_create(struct pipe_screen *pscreen, void *priv)
+fd3_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
 {
        struct fd_screen *screen = fd_screen(pscreen);
        struct fd3_context *fd3_ctx = CALLOC_STRUCT(fd3_context);
@@ -103,6 +79,7 @@ fd3_context_create(struct pipe_screen *pscreen, void *priv)
                return NULL;
 
        pctx = &fd3_ctx->base.base;
+       pctx->screen = pscreen;
 
        fd3_ctx->base.dev = fd_device_ref(screen->dev);
        fd3_ctx->base.screen = fd_screen(pscreen);
@@ -116,26 +93,29 @@ fd3_context_create(struct pipe_screen *pscreen, void *priv)
        fd3_gmem_init(pctx);
        fd3_texture_init(pctx);
        fd3_prog_init(pctx);
+       fd3_emit_init(pctx);
 
-       pctx = fd_context_init(&fd3_ctx->base, pscreen, primtypes, priv);
+       pctx = fd_context_init(&fd3_ctx->base, pscreen, primtypes, priv, flags);
        if (!pctx)
                return NULL;
 
-       util_dynarray_init(&fd3_ctx->rbrc_patches);
+       fd_hw_query_init(pctx);
 
        fd3_ctx->vs_pvt_mem = fd_bo_new(screen->dev, 0x2000,
-                       DRM_FREEDRENO_GEM_TYPE_KMEM);
+                       DRM_FREEDRENO_GEM_TYPE_KMEM, "vs_pvt");
 
        fd3_ctx->fs_pvt_mem = fd_bo_new(screen->dev, 0x2000,
-                       DRM_FREEDRENO_GEM_TYPE_KMEM);
+                       DRM_FREEDRENO_GEM_TYPE_KMEM, "fs_pvt");
 
        fd3_ctx->vsc_size_mem = fd_bo_new(screen->dev, 0x1000,
-                       DRM_FREEDRENO_GEM_TYPE_KMEM);
+                       DRM_FREEDRENO_GEM_TYPE_KMEM, "vsc_size");
 
-       fd3_ctx->solid_vbuf = create_solid_vertexbuf(pctx);
-       fd3_ctx->blit_texcoord_vbuf = create_blit_texcoord_vertexbuf(pctx);
+       fd_context_setup_common_vbos(&fd3_ctx->base);
 
        fd3_query_context_init(pctx);
 
+       fd3_ctx->border_color_uploader = u_upload_create(pctx, 4096, 0,
+                                                         PIPE_USAGE_STREAM, 0);
+
        return pctx;
 }