diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2021-03-16 19:04:08 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2021-03-18 09:34:35 -0700 |
| commit | 74af2631b9ec4fef99866e4f81d433c8b00c00a8 (patch) | |
| tree | 8ef6d2135bdfcb168e6bb27abc31546eb8af930e | |
| parent | d3887f23bea2af461bd5df8cc10f4a05e53d9c7d (diff) | |
gallium/st: fix shader_has_one_variant
I think we need to care about this here as well, otherwise the variant
logic might be short-circuited.
Fixes: 7eb5fd98fd1 ("mesa/st: handle running nir lower passes for ucp and psiz in tess stage")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9631>
(cherry picked from commit 78de2de8f31e8eb94799679618caefe7010f26ed)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_context.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index d57209eb69d..761dffe48e2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -76,7 +76,7 @@ "description": "gallium/st: fix shader_has_one_variant", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "7eb5fd98fd188c2765b80c278086e5a4382539a8" }, diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 38d192bd3ec..d5b20e1955b 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -810,7 +810,8 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe, st->has_shareable_shaders && !st->clamp_frag_depth_in_shader && !st->clamp_vert_color_in_shader && - !st->lower_point_size; + !st->lower_point_size && + !st->lower_ucp; st->shader_has_one_variant[MESA_SHADER_GEOMETRY] = st->has_shareable_shaders && |