diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2014-06-06 22:07:34 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-06-06 23:19:53 -0700 |
| commit | c2fc9fb90786cae02d589ee7242d5f5fe99bdbec (patch) | |
| tree | a612d19410bcec95946e1386f5aca87690cbb679 | |
| parent | 28d41e409d74aabe35f1031e759179e82cb760b4 (diff) | |
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@intel.com>
Reported-by: Laurent Carlier <lordheavym@gmail.com>
Tested-by: Laurent Carlier <lordheavym@gmail.com>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_blit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 892ee84a75e..1dfff49d102 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, |