diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2021-11-04 12:53:41 -0400 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2021-11-05 02:36:32 +0000 |
| commit | 833c0394e01b178a33ce9f468e50408ff4970428 (patch) | |
| tree | 36d6f2c1d6666f38ed68e9a9f9f1f12c2f8d8f1f | |
| parent | 60a8d682850efe945527554a4d80fc598cf0c870 (diff) | |
Revert "gallium/u_blitter: work around broken sample shading in llvmpipe and zink"
This reverts commit 8b287c3f925121d9389df9846024d9c350cbb235.
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13679>
| -rw-r--r-- | src/gallium/auxiliary/util/u_blitter.c | 7 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_blitter.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_context.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_context.c | 2 |
4 files changed, 0 insertions, 11 deletions
diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index ddf0341c935..f23474325e1 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_blitter.c @@ -349,13 +349,6 @@ struct blitter_context *util_blitter_create(struct pipe_context *pipe) return &ctx->base; } -void util_blitter_sample_shading_force_off(struct blitter_context *blitter) -{ - struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter; - - ctx->has_sample_shading = false; -} - void *util_blitter_get_noop_blend_state(struct blitter_context *blitter) { struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter; diff --git a/src/gallium/auxiliary/util/u_blitter.h b/src/gallium/auxiliary/util/u_blitter.h index 68424acbf85..70157e5df4b 100644 --- a/src/gallium/auxiliary/util/u_blitter.h +++ b/src/gallium/auxiliary/util/u_blitter.h @@ -154,7 +154,6 @@ struct blitter_context *util_blitter_create(struct pipe_context *pipe); */ void util_blitter_destroy(struct blitter_context *blitter); -void util_blitter_sample_shading_force_off(struct blitter_context *blitter); void util_blitter_cache_all_shaders(struct blitter_context *blitter); void *util_blitter_get_noop_blend_state(struct blitter_context *blitter); void *util_blitter_get_noop_dsa_state(struct blitter_context *blitter); diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c index e7dc5457e8e..35f3618e8d7 100644 --- a/src/gallium/drivers/llvmpipe/lp_context.c +++ b/src/gallium/drivers/llvmpipe/lp_context.c @@ -268,7 +268,6 @@ llvmpipe_create_context(struct pipe_screen *screen, void *priv, goto fail; } - util_blitter_sample_shading_force_off(llvmpipe->blitter); /* must be done before installing Draw stages */ util_blitter_cache_all_shaders(llvmpipe->blitter); diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 2edcb1907c0..48d701a139e 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -4153,8 +4153,6 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags) if (!ctx->blitter) goto fail; - util_blitter_sample_shading_force_off(ctx->blitter); - ctx->gfx_pipeline_state.shader_keys.last_vertex.key.vs_base.last_vertex_stage = true; ctx->last_vertex_stage_dirty = true; ctx->gfx_pipeline_state.shader_keys.key[PIPE_SHADER_VERTEX].size = sizeof(struct zink_vs_key_base); |