diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2020-12-07 17:42:43 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-12-07 17:29:39 +0000 |
| commit | 3abac03d49b5dc4a6642fe0637da5a19ad60dd4f (patch) | |
| tree | 2a97655130fd5827f8593ff204b8ed41904f7d40 | |
| parent | c4342755cc08c2dc3650bdeafa9c07f51b8b87f1 (diff) | |
gallium: do not reset buffers for unsupported stages
There's no good reason why drivers that doesn't grok geometry,
tesselation or compute shaders needs to deal with them.
This fixes a crash on a lot of Piglit tests for Zink.
Fixes: daaf5f1d186 ("gallium: Fix leak of currently bound UBOs at CSO context destruction.")
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7971>
| -rw-r--r-- | src/gallium/auxiliary/cso_cache/cso_context.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c index 83ae170ad92..a7550afc033 100644 --- a/src/gallium/auxiliary/cso_cache/cso_context.c +++ b/src/gallium/auxiliary/cso_cache/cso_context.c @@ -370,6 +370,24 @@ void cso_destroy_context( struct cso_context *ctx ) struct pipe_screen *scr = ctx->pipe->screen; enum pipe_shader_type sh; for (sh = 0; sh < PIPE_SHADER_TYPES; sh++) { + switch (sh) { + case PIPE_SHADER_GEOMETRY: + if (!ctx->has_geometry_shader) + continue; + break; + case PIPE_SHADER_TESS_CTRL: + case PIPE_SHADER_TESS_EVAL: + if (!ctx->has_tessellation) + continue; + break; + case PIPE_SHADER_COMPUTE: + if (!ctx->has_compute_shader) + continue; + break; + default: + break; + } + int maxsam = scr->get_shader_param(scr, sh, PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS); int maxview = scr->get_shader_param(scr, sh, |