[Mesa-stable] [Mesa-dev] [PATCH] i965: Ignore 'centroid' interpolation qualifier in case of persample shading

[Ian Romanick]

On 01/22/2014 04:54 PM, Anuj Phogat wrote:
> I missed this change in commit f5cfb4a. It fixes the incorrect
> rendering caused in Dolphin Emulator.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73915
> 
> Cc: Markus wick <wickmarkus at web.de>
> Cc: mesa-stable at lists.freedesktop.org
> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

> ---
>  src/mesa/drivers/dri/i965/brw_wm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
> index a6b558f..862c626 100644
> --- a/src/mesa/drivers/dri/i965/brw_wm.c
> +++ b/src/mesa/drivers/dri/i965/brw_wm.c
> @@ -62,7 +62,8 @@ brw_compute_barycentric_interp_modes(struct brw_context *brw,
>     for (attr = 0; attr < VARYING_SLOT_MAX; ++attr) {
>        enum glsl_interp_qualifier interp_qualifier =
>           fprog->InterpQualifier[attr];
> -      bool is_centroid = fprog->IsCentroid & BITFIELD64_BIT(attr);
> +      bool is_centroid = (fprog->IsCentroid & BITFIELD64_BIT(attr)) &&
> +         !persample_shading;
>        bool is_sample = (fprog->IsSample & BITFIELD64_BIT(attr)) ||
>           persample_shading;
>        bool is_gl_Color = attr == VARYING_SLOT_COL0 || attr == VARYING_SLOT_COL1;
>