← Back to branch summary

~ubuntu-branches/ubuntu/precise/mesa-lts-quantal/precise-updates

« back to all changes in this revision

Viewing changes to src/gallium/drivers/r600/r600_blit.c

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2013-02-11 16:46:55 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20130211164655-23kq9rr4w7wjg70q
Tags: 9.0.2-0ubuntu0.1~precise1
https://launchpad.net/bugs/1130563
Sync MRE update from quantal (LP: #1130563)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallium/drivers/r600/r600_blit.c
387
387
{
388
388
   unsigned dst_width = u_minify(info->dst.res->width0, info->dst.level);
389
389
   unsigned dst_height = u_minify(info->dst.res->height0, info->dst.level);
 
390
   struct r600_texture *dst = (struct r600_texture*)info->dst.res;
 
391
   unsigned dst_tile_mode = dst->surface.level[info->dst.level].mode;
390
392
 
391
393
   return info->dst.res->format == info->src.res->format &&
392
394
          dst_width == info->src.res->width0 &&
398
400
          info->src.x0 == 0 &&
399
401
          info->src.y0 == 0 &&
400
402
          info->src.x1 == dst_width &&
401
 
          info->src.y1 == dst_height;
 
403
          info->src.y1 == dst_height &&
 
404
          /* Dst must be tiled. If it's not, we have to use a temporary
 
405
           * resource which is tiled. */
 
406
          dst_tile_mode >= RADEON_SURF_MODE_1D;
402
407
}
403
408
 
404
409
static void r600_color_resolve(struct pipe_context *ctx,
434
439
        templ.nr_samples = 0;
435
440
        templ.usage = PIPE_USAGE_STATIC;
436
441
        templ.bind = PIPE_BIND_RENDER_TARGET | PIPE_BIND_SAMPLER_VIEW;
437
 
        templ.flags = 0;
 
442
        templ.flags = R600_RESOURCE_FLAG_FORCE_TILING; /* dst must not have a linear layout */
438
443
 
439
444
        tmp = screen->resource_create(screen, &templ);
440
445