diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2020-12-07 17:42:43 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-12-08 09:46:54 -0800 |
| commit | 17ef9b55d09020bc0b795e309b9f71fdd72315ae (patch) | |
| tree | 72d9fa1dfdcbfb219ae59ad8841f4f6dbd357340 | |
| parent | d77d3caeca64be6ee25a10f36ed72355720c2be7 (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>
(cherry picked from commit 3abac03d49b5dc4a6642fe0637da5a19ad60dd4f)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/cso_cache/cso_context.c | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 3693fe1bb3c..6100bc8a800 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -319,7 +319,7 @@ "description": "gallium: do not reset buffers for unsupported stages", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "daaf5f1d1868bebec7931a51753236a850ebbd24" }, diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c index eda13c4e301..df040ee6372 100644 --- a/src/gallium/auxiliary/cso_cache/cso_context.c +++ b/src/gallium/auxiliary/cso_cache/cso_context.c @@ -376,6 +376,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, |