fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 21:40:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panfrost: Move panfrost_attach_vt_framebuffer() to pan_cmdstream.c

Browse source 
Move panfrost_attach_vt_framebuffer() to pan_cmdstream.c and change its
name to panfrost_vt_attach_framebuffer() so we can use a consistent
prefix (panfrost_vt_) for all helpers initializing/updating
midgard_payload_vertex_tiler fields.

Note that the function only initializes one VT object now.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4083>
This commit is contained in:
Boris Brezillon 2020-03-06 09:59:56 +01:00
parent 5d33d42b4d
commit 0d75eb002e
3 changed files with 38 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -22,12 +22,43 @@
* SOFTWARE.
*/
#include "util/macros.h"
#include "panfrost-quirks.h"
#include "pan_allocate.h"
#include "pan_bo.h"
#include "pan_cmdstream.h"
#include "pan_context.h"
#include "pan_job.h"
/* TODO: Bifrost requires just a mali_shared_memory, without the rest of the
* framebuffer */
void
panfrost_vt_attach_framebuffer(struct panfrost_context *ctx,
struct midgard_payload_vertex_tiler *vt)
{
struct panfrost_screen *screen = pan_screen(ctx->base.screen);
struct panfrost_batch *batch = panfrost_get_batch_for_fbo(ctx);
/* If we haven't, reserve space for the framebuffer */
if (!batch->framebuffer.gpu) {
unsigned size = (screen->quirks & MIDGARD_SFBD) ?
sizeof(struct mali_single_framebuffer) :
sizeof(struct mali_framebuffer);
batch->framebuffer = panfrost_allocate_transient(batch, size);
/* Tag the pointer */
if (!(screen->quirks & MIDGARD_SFBD))
batch->framebuffer.gpu |= MALI_MFBD;
}
vt->postfix.shared_memory = batch->framebuffer.gpu;
}
void
panfrost_emit_shader_meta(struct panfrost_batch *batch,
enum pipe_shader_type st,

4
src/gallium/drivers/panfrost/pan_cmdstream.h
View file

@ -32,6 +32,10 @@
#include "pan_job.h"
void
panfrost_vt_attach_framebuffer(struct panfrost_context *ctx,
struct midgard_payload_vertex_tiler *vt);
void
panfrost_emit_shader_meta(struct panfrost_batch *batch,
enum pipe_shader_type st,

31
src/gallium/drivers/panfrost/pan_context.c
View file

@ -142,33 +142,6 @@ panfrost_clear(
panfrost_batch_clear(batch, buffers, color, depth, stencil);
}
/* TODO: Bifrost requires just a mali_shared_memory, without the rest of the
* framebuffer */
static void
panfrost_attach_vt_framebuffer(struct panfrost_context *ctx)
{
struct panfrost_screen *screen = pan_screen(ctx->base.screen);
struct panfrost_batch *batch = panfrost_get_batch_for_fbo(ctx);
/* If we haven't, reserve space for the framebuffer */
if (!batch->framebuffer.gpu) {
unsigned size = (screen->quirks & MIDGARD_SFBD) ?
sizeof(struct mali_single_framebuffer) :
sizeof(struct mali_framebuffer);
batch->framebuffer = panfrost_allocate_transient(batch, size);
/* Tag the pointer */
if (!(screen->quirks & MIDGARD_SFBD))
batch->framebuffer.gpu |= MALI_MFBD;
}
for (unsigned i = 0; i < PIPE_SHADER_TYPES; ++i)
ctx->payloads[i].postfix.shared_memory = batch->framebuffer.gpu;
}
/* Reset per-frame context, called on context initialisation as well as after
* flushing a frame */
@ -559,7 +532,9 @@ panfrost_emit_for_draw(struct panfrost_context *ctx, bool with_vertex_data)
struct panfrost_screen *screen = pan_screen(ctx->base.screen);
panfrost_batch_add_fbo_bos(batch);
panfrost_attach_vt_framebuffer(ctx);
for (int i = 0; i < PIPE_SHADER_TYPES; ++i)
panfrost_vt_attach_framebuffer(ctx, &ctx->payloads[i]);
if (with_vertex_data) {
panfrost_emit_vertex_data(batch);