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

panfrost: Dynamically allocate shader variants

Browse source 
This fixes a crash in LZDoom where over 16 shader variants are needed
for a few shaders in some maps, and should also save a few kilobytes
of RAM as most of the time only one or two variants of the 8 previously
allocated are actually needed.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Icecream95 2020-01-12 14:19:25 +13:00 • committed by Alyssa Rosenzweig
parent bef716b56c
commit d8a3501f1b
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1759,6 +1759,7 @@ panfrost_delete_shader_state(
panfrost_bo_unreference(shader_state->bo); panfrost_bo_unreference(shader_state->bo);
shader_state->bo = NULL; shader_state->bo = NULL;
} }
free(cso->variants);
free(so); free(so);
} }
@ -1958,7 +1959,25 @@ panfrost_bind_shader_state(
if (variant == -1) { if (variant == -1) {
/* No variant matched, so create a new one */ /* No variant matched, so create a new one */
variant = variants->variant_count++; variant = variants->variant_count++;
assert(variants->variant_count < MAX_SHADER_VARIANTS);
if (variants->variant_count > variants->variant_space) {
unsigned old_space = variants->variant_space;
variants->variant_space *= 2;
if (variants->variant_space == 0)
variants->variant_space = 1;
/* Arbitrary limit to stop runaway programs from
* creating an unbounded number of shader variants. */
assert(variants->variant_space < 1024);
unsigned msize = sizeof(struct panfrost_shader_state);
variants->variants = realloc(variants->variants,
variants->variant_space * msize);
memset(&variants->variants[old_space], 0,
(variants->variant_space - old_space) * msize);
}
struct panfrost_shader_state *v = struct panfrost_shader_state *v =
&variants->variants[variant]; &variants->variants[variant];

5
src/gallium/drivers/panfrost/pan_context.h
View file

@ -199,7 +199,6 @@ struct panfrost_rasterizer {
/* Variants bundle together to form the backing CSO, bundling multiple /* Variants bundle together to form the backing CSO, bundling multiple
* shaders with varying emulated features baked in (alpha test * shaders with varying emulated features baked in (alpha test
* parameters, etc) */ * parameters, etc) */
#define MAX_SHADER_VARIANTS 8
/* A shader state corresponds to the actual, current variant of the shader */ /* A shader state corresponds to the actual, current variant of the shader */
struct panfrost_shader_state { struct panfrost_shader_state {
@ -248,7 +247,9 @@ struct panfrost_shader_variants {
struct pipe_compute_state cbase; struct pipe_compute_state cbase;
}; };
struct panfrost_shader_state variants[MAX_SHADER_VARIANTS]; struct panfrost_shader_state *variants;
unsigned variant_space;
unsigned variant_count; unsigned variant_count;
/* The current active variant */ /* The current active variant */