fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panfrost: Inline pan_prepare_shader_descriptor

Browse source 
Complicates the next patch.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10976>
This commit is contained in:
Alyssa Rosenzweig 2021-05-24 17:24:52 -04:00 • committed by Marge Bot
parent 6bb66b78a9
commit 7b4a76f493
1 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/gallium/drivers/panfrost/pan_assemble.c
View file

@ -39,28 +39,6 @@
#include "tgsi/tgsi_dump.h"
static void
pan_prepare_shader_descriptor(struct panfrost_context *ctx,
struct panfrost_shader_state *state,
bool upload)
{
const struct panfrost_device *dev = pan_device(ctx->base.screen);
struct mali_renderer_state_packed *out = &state->partial_rsd;
if (upload) {
struct panfrost_ptr ptr =
panfrost_pool_alloc_desc(&ctx->descs, RENDERER_STATE);
state->state = pan_take_ref(&ctx->descs, ptr.gpu);
out = ptr.cpu;
}
pan_pack(out, RENDERER_STATE, cfg) {
pan_shader_prepare_rsd(dev, &state->info, state->bin.gpu,
&cfg);
}
}
void
panfrost_shader_compile(struct panfrost_context *ctx,
enum pipe_shader_ir ir_type,
@ -104,8 +82,22 @@ panfrost_shader_compile(struct panfrost_context *ctx,
binary.data, binary.size, 128));
}
pan_prepare_shader_descriptor(ctx, state,
stage != MESA_SHADER_FRAGMENT);
struct mali_renderer_state_packed *out = &state->partial_rsd;
/* Upload RSDs for non-fragment shaders. Fragment shaders need draw
* time finalization based on the renderer state. */
if (stage != MESA_SHADER_FRAGMENT) {
struct panfrost_ptr ptr =
panfrost_pool_alloc_desc(&ctx->descs, RENDERER_STATE);
state->state = pan_take_ref(&ctx->descs, ptr.gpu);
out = ptr.cpu;
}
pan_pack(out, RENDERER_STATE, cfg) {
pan_shader_prepare_rsd(dev, &state->info, state->bin.gpu,
&cfg);
}
util_dynarray_fini(&binary);