From: Lucas Stach Date: Thu, 8 Jun 2017 15:06:02 +0000 (+0200) Subject: etnaviv: remove flat shading workaround X-Git-Tag: android-x86-8.1-r1~9228 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0ab59f120b40191c60489ebc5383d6a886697c40;p=android-x86%2Fexternal-mesa.git etnaviv: remove flat shading workaround It turned out not to be a hardware bug, but the shader compiler emitting wrong varying component use information. With that fixed we can turn flat shading back on. Signed-off-by: Lucas Stach Reviewed-by: Philipp Zabel Reviewed-by: Wladimir J. van der Laan --- diff --git a/src/gallium/drivers/etnaviv/etnaviv_rasterizer.c b/src/gallium/drivers/etnaviv/etnaviv_rasterizer.c index 4990fd18025..56f2735e8a1 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_rasterizer.c +++ b/src/gallium/drivers/etnaviv/etnaviv_rasterizer.c @@ -38,10 +38,6 @@ etna_rasterizer_state_create(struct pipe_context *pctx, struct etna_rasterizer_state *cs; struct etna_context *ctx = etna_context(pctx); - /* Disregard flatshading on GC880+, as a HW bug there seem to disable all - * varying interpolation if it's enabled */ - bool flatshade = ctx->screen->model < 880 ? so->flatshade : false; - if (so->fill_front != so->fill_back) DBG("Different front and back fill mode not supported"); @@ -51,7 +47,7 @@ etna_rasterizer_state_create(struct pipe_context *pctx, cs->base = *so; - cs->PA_CONFIG = (flatshade ? VIVS_PA_CONFIG_SHADE_MODEL_FLAT : VIVS_PA_CONFIG_SHADE_MODEL_SMOOTH) | + cs->PA_CONFIG = (so->flatshade ? VIVS_PA_CONFIG_SHADE_MODEL_FLAT : VIVS_PA_CONFIG_SHADE_MODEL_SMOOTH) | translate_cull_face(so->cull_face, so->front_ccw) | translate_polygon_mode(so->fill_front) | COND(so->point_quad_rasterization, VIVS_PA_CONFIG_POINT_SPRITE_ENABLE) |