[Mesa-stable] [PATCH] meta/blit: Use gl_FragColor also in the msaa blit shader

Anuj Phogat anuj.phogat at gmail.com
Tue May 27 09:59:28 PDT 2014


On Tue, May 27, 2014 at 6:21 AM, Topi Pohjolainen
<topi.pohjolainen at intel.com> wrote:
> Fixes framebuffer_blit_functionality_multisampled_to_singlesampled_blit
> es3 cts test on bdw. Also fixes this on ivb when ivb is forced to use
> the meta path.
>
> No piglit regressions on IVB.
>
> Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
> Cc: Eric Anholt <eric at anholt.net>
> Cc: Matt Turner <mattst88 at gmail.com>
> Cc: Kenneth Graunke <kenneth at whitecape.org>
> Cc: Anuj Phogat <anuj.phogat at gmail.com>
> Cc: "10.2" <mesa-stable at lists.freedesktop.org>
> ---
>  src/mesa/drivers/common/meta_blit.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c
> index 84594d1..5929619 100644
> --- a/src/mesa/drivers/common/meta_blit.c
> +++ b/src/mesa/drivers/common/meta_blit.c
> @@ -273,7 +273,7 @@ setup_glsl_msaa_blit_shader(struct gl_context *ctx,
>                                     samples);
>           } else {
>              ralloc_asprintf_append(&sample_resolve,
> -                                   "   out_color = sample_%d_0 / %f;\n",
> +                                   "   gl_FragColor = sample_%d_0 / %f;\n",
>                                     samples, (float)samples);
>           }
>        }
> --
> 1.8.3.1
>
This fixes msaa blits to multiple render targets for float buffers.

Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>


More information about the mesa-stable mailing list