u_upload_mgr: remove alignment parameter from u_upload_create

[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 23467193d4331cc21c361f1e31da06e70433ee8a..edc716e25c8e55d64caf55052ac12ae0700ad5d9 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_context.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_context.c
@@ -33,6 +33,7 @@
 #include "fd3_emit.h"
 #include "fd3_gmem.h"
 #include "fd3_program.h"
+#include "fd3_query.h"
 #include "fd3_rasterizer.h"
 #include "fd3_texture.h"
 #include "fd3_zsa.h"
@@ -42,15 +43,20 @@ fd3_context_destroy(struct pipe_context *pctx)
 {
        struct fd3_context *fd3_ctx = fd3_context(fd_context(pctx));
 
-       fd3_prog_fini(pctx);
+       util_dynarray_fini(&fd3_ctx->rbrc_patches);
 
        fd_bo_del(fd3_ctx->vs_pvt_mem);
        fd_bo_del(fd3_ctx->fs_pvt_mem);
        fd_bo_del(fd3_ctx->vsc_size_mem);
 
+       pctx->delete_vertex_elements_state(pctx, fd3_ctx->solid_vbuf_state.vtx);
+       pctx->delete_vertex_elements_state(pctx, fd3_ctx->blit_vbuf_state.vtx);
+
        pipe_resource_reference(&fd3_ctx->solid_vbuf, NULL);
        pipe_resource_reference(&fd3_ctx->blit_texcoord_vbuf, NULL);
 
+       u_upload_destroy(fd3_ctx->border_color_uploader);
+
        fd_context_destroy(pctx);
 }
 
@@ -82,7 +88,7 @@ create_blit_texcoord_vertexbuf(struct pipe_context *pctx)
 }
 
 static const uint8_t primtypes[PIPE_PRIM_MAX] = {
-               [PIPE_PRIM_POINTS]         = DI_PT_POINTLIST_A3XX,
+               [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,
@@ -92,7 +98,7 @@ static const uint8_t primtypes[PIPE_PRIM_MAX] = {
 };
 
 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 +109,7 @@ fd3_context_create(struct pipe_screen *pscreen, void *priv)
 
        pctx = &fd3_ctx->base.base;
 
+       fd3_ctx->base.dev = fd_device_ref(screen->dev);
        fd3_ctx->base.screen = fd_screen(pscreen);
 
        pctx->destroy = fd3_context_destroy;
@@ -114,11 +121,14 @@ 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);
        if (!pctx)
                return NULL;
 
+       util_dynarray_init(&fd3_ctx->rbrc_patches);
+
        fd3_ctx->vs_pvt_mem = fd_bo_new(screen->dev, 0x2000,
                        DRM_FREEDRENO_GEM_TYPE_KMEM);
 
@@ -131,5 +141,37 @@ fd3_context_create(struct pipe_screen *pscreen, void *priv)
        fd3_ctx->solid_vbuf = create_solid_vertexbuf(pctx);
        fd3_ctx->blit_texcoord_vbuf = create_blit_texcoord_vertexbuf(pctx);
 
+       /* setup solid_vbuf_state: */
+       fd3_ctx->solid_vbuf_state.vtx = pctx->create_vertex_elements_state(
+                       pctx, 1, (struct pipe_vertex_element[]){{
+                               .vertex_buffer_index = 0,
+                               .src_offset = 0,
+                               .src_format = PIPE_FORMAT_R32G32B32_FLOAT,
+                       }});
+       fd3_ctx->solid_vbuf_state.vertexbuf.count = 1;
+       fd3_ctx->solid_vbuf_state.vertexbuf.vb[0].stride = 12;
+       fd3_ctx->solid_vbuf_state.vertexbuf.vb[0].buffer = fd3_ctx->solid_vbuf;
+
+       /* setup blit_vbuf_state: */
+       fd3_ctx->blit_vbuf_state.vtx = pctx->create_vertex_elements_state(
+                       pctx, 2, (struct pipe_vertex_element[]){{
+                               .vertex_buffer_index = 0,
+                               .src_offset = 0,
+                               .src_format = PIPE_FORMAT_R32G32_FLOAT,
+                       }, {
+                               .vertex_buffer_index = 1,
+                               .src_offset = 0,
+                               .src_format = PIPE_FORMAT_R32G32B32_FLOAT,
+                       }});
+       fd3_ctx->blit_vbuf_state.vertexbuf.count = 2;
+       fd3_ctx->blit_vbuf_state.vertexbuf.vb[0].stride = 8;
+       fd3_ctx->blit_vbuf_state.vertexbuf.vb[0].buffer = fd3_ctx->blit_texcoord_vbuf;
+       fd3_ctx->blit_vbuf_state.vertexbuf.vb[1].stride = 12;
+       fd3_ctx->blit_vbuf_state.vertexbuf.vb[1].buffer = fd3_ctx->solid_vbuf;
+
+       fd3_query_context_init(pctx);
+
+       fd3_ctx->border_color_uploader = u_upload_create(pctx, 4096, 0);
+
        return pctx;
 }