openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2024-12-11 17:44:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "gallium/u_blitter: work around broken sample shading in llvmpipe and zink"

Browse Source 
This reverts commit 8b287c3f92.

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>
This commit is contained in:
Mike Blumenkrantz 2021-11-04 12:53:41 -04:00 committed by Marge Bot
parent 60a8d68285
commit 833c0394e0
4 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/auxiliary/util/u_blitter.c
View File

@ -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;

1
src/gallium/auxiliary/util/u_blitter.h
View File

@ -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);

1
src/gallium/drivers/llvmpipe/lp_context.c
View File

@ -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);

2
src/gallium/drivers/zink/zink_context.c
View File

@ -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);