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

panfrost: Remove NIR_SERIALIZED support

Browse source 
Only used by Clover (due to the dynamic pipeloader), which we never
shipped support for. We'll do OpenCL via Rusticl, which does not use the
dynamic pipeloader.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Acked-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18972>
This commit is contained in:
Alyssa Rosenzweig 2022-10-05 12:12:47 -04:00 • committed by Marge Bot
parent dfce433385
commit 9de7e49e6f
2 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gallium/drivers/panfrost/pan_compute.c
View file

@ -43,7 +43,6 @@ panfrost_create_compute_state(
const struct pipe_compute_state *cso)
{
struct panfrost_context *ctx = pan_context(pctx);
struct panfrost_screen *screen = pan_screen(pctx->screen);
struct panfrost_shader_variants *so = CALLOC_STRUCT(panfrost_shader_variants);
so->req_input_mem = cso->req_input_mem;
@ -54,28 +53,11 @@ panfrost_create_compute_state(
so->variant_count = 1;
so->active_variant = 0;
nir_shader *deserialized = NULL;
if (cso->ir_type == PIPE_SHADER_IR_NIR_SERIALIZED) {
struct blob_reader reader;
const struct pipe_binary_program_header *hdr = cso->prog;
blob_reader_init(&reader, hdr->blob, hdr->num_bytes);
const struct nir_shader_compiler_options *options =
screen->vtbl.get_compiler_options();
deserialized = nir_deserialize(NULL, options, &reader);
} else {
assert(cso->ir_type == PIPE_SHADER_IR_NIR && "TGSI kernels unsupported");
}
assert(cso->ir_type == PIPE_SHADER_IR_NIR && "TGSI kernels unsupported");
panfrost_shader_compile(pctx->screen, &ctx->shaders, &ctx->descs,
deserialized ?: cso->prog,
&ctx->base.debug, v, cso->req_local_mem);
/* There are no variants so we won't need the NIR again */
ralloc_free(deserialized);
cso->prog, &ctx->base.debug, v,
cso->req_local_mem);
return so;
}

2
src/gallium/drivers/panfrost/pan_screen.c
View file

@ -458,7 +458,7 @@ panfrost_get_shader_param(struct pipe_screen *screen,
return PIPE_SHADER_IR_NIR;
case PIPE_SHADER_CAP_SUPPORTED_IRS:
return (1 << PIPE_SHADER_IR_NIR) | (1 << PIPE_SHADER_IR_NIR_SERIALIZED);
return (1 << PIPE_SHADER_IR_NIR);
case PIPE_SHADER_CAP_MAX_SHADER_BUFFERS:
return allow_side_effects ? 16 : 0;