diff options
| author | Alyssa Rosenzweig <alyssa@collabora.com> | 2022-10-05 12:12:47 -0400 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-10-21 21:12:14 +0000 |
| commit | 9de7e49e6f015aa070338faffac439f2fa60b09b (patch) | |
| tree | 05315d2a21e317262dc3515569d02eaf39fb03c1 | |
| parent | dfce4333854ecfba47cda99b256563e5ac27a2e7 (diff) | |
panfrost: Remove NIR_SERIALIZED support
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>
| -rw-r--r-- | src/gallium/drivers/panfrost/pan_compute.c | 24 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/pan_screen.c | 2 |
2 files changed, 4 insertions, 22 deletions
diff --git a/src/gallium/drivers/panfrost/pan_compute.c b/src/gallium/drivers/panfrost/pan_compute.c index 197e9b18432..780b2b521b5 100644 --- a/src/gallium/drivers/panfrost/pan_compute.c +++ b/src/gallium/drivers/panfrost/pan_compute.c @@ -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; } diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index 72449088b44..04e085882ba 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -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; |