Le vendredi 6 juin 2014, 22:11:43 Ian Romanick a écrit :
> From: Ian Romanick <ian.d.roman...@intel.com>
>
> While resolving conflicts in cherry picking commit d226191, I
> accidentally introduced some garbage. Because radeonsi isn't built by
> default, the problem went unnoticed by me.
>
> Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
> Reported-by: Laurent Carlier <lordhea...@gmail.com>
> ---
>
> Laurent, can you verify that this fixes your build?
>
> src/gallium/drivers/radeonsi/si_blit.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_blit.c
> b/src/gallium/drivers/radeonsi/si_blit.c index 892ee84..1dfff49 100644
> --- a/src/gallium/drivers/radeonsi/si_blit.c
> +++ b/src/gallium/drivers/radeonsi/si_blit.c
> @@ -692,7 +692,6 @@ static bool do_hardware_msaa_resolve(struct pipe_context
> *ctx, !(dst->surface.flags & RADEON_SURF_SCANOUT) &&
> (!dst->cmask.size || !dst->dirty_level_mask) /* dst cannot be
> fast-cleared */) { si_blitter_begin(ctx, SI_COLOR_RESOLVE);
> -t-cleared
> util_blitter_custom_resolve_color(sctx->blitter,
> info->dst.resource,
> info->dst.level,
> info->dst.box.z,Now mesa builds fine. Thanks -- Laurent Carlier ArchLinux Developer http://www.archlinux.org
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
