On 05/27/2014 06:21 AM, Topi Pohjolainen 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.pohjolai...@intel.com>
> Cc: Eric Anholt <e...@anholt.net>
> Cc: Matt Turner <matts...@gmail.com>
> Cc: Kenneth Graunke <kenn...@whitecape.org>
> Cc: Anuj Phogat <anuj.pho...@gmail.com>
> Cc: "10.2" <mesa-sta...@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);
> }
> }
> Seems reasonable in the short term, and this gets: Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Unfortunately, this doesn't fix MRT for integer data. In the single-sampled case, since we're directly copying data, we were read/copy/write data as "float" values, which actually contained the integer bits. Here, we can't do that since we need to process the actual integer data. I do wonder if we could use intBitsToFloat/uintBitsToFloat to stuff the integer bits in the float gl_FragColor output. Just a crazy idea. In the long term (post 10.2), I think we should draft an extension that allows you to do "layout(location = all)" on user-defined fragment shader outputs. (Or some similar syntax.) --Ken
signature.asc
Description: OpenPGP digital signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
