Mesa (10.2): radeonsi: Fix build error introduced in 5ab9a9c
Ian Romanick
idr at kemper.freedesktop.org
Sat Jun 7 06:31:07 UTC 2014
Module: Mesa
Branch: 10.2
Commit: c2fc9fb90786cae02d589ee7242d5f5fe99bdbec
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c2fc9fb90786cae02d589ee7242d5f5fe99bdbec
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Jun 6 22:07:34 2014 -0700
radeonsi: Fix build error introduced in 5ab9a9c
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.romanick at intel.com>
Reported-by: Laurent Carlier <lordheavym at gmail.com>
Tested-by: Laurent Carlier <lordheavym at gmail.com>
---
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,
More information about the mesa-commit
mailing list