← Back to branch summary

~ubuntu-branches/ubuntu/raring/xserver-xorg-video-intel/raring

« back to all changes in this revision

Viewing changes to src/sna/sna_render.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2013-01-08 17:58:48 UTC
  • mfrom: (1.4.28)
  • Revision ID: package-import@ubuntu.com-20130108175848-98g6sbzeepup1kgw
Tags: 2:2.20.17-0ubuntu1
Merge from unreleased debian git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/sna/sna_render.c
246
246
no_render_context_switch(struct kgem *kgem,
247
247
                         int new_mode)
248
248
{
249
 
        if (!kgem->mode)
 
249
        if (!kgem->nbatch)
250
250
                return;
251
251
 
252
252
        if (kgem_ring_is_idle(kgem, kgem->ring)) {
254
254
                _kgem_submit(kgem);
255
255
        }
256
256
 
257
 
        (void)kgem;
258
257
        (void)new_mode;
259
258
}
260
259
 
529
528
                    channel->width  == pixmap->drawable.width &&
530
529
                    channel->height == pixmap->drawable.height) {
531
530
                        assert(priv->gpu_damage == NULL);
532
 
                        assert(DAMAGE_IS_ALL(priv->cpu_damage));
533
531
                        assert(priv->gpu_bo == NULL);
534
532
                        kgem_proxy_bo_attach(bo, &priv->gpu_bo);
535
533
                }
1165
1163
                                struct sna_pixmap *priv = sna_pixmap(pixmap);
1166
1164
                                if (priv) {
1167
1165
                                        assert(priv->gpu_damage == NULL);
1168
 
                                        assert(DAMAGE_IS_ALL(priv->cpu_damage));
1169
1166
                                        assert(priv->gpu_bo == NULL);
1170
1167
                                        kgem_proxy_bo_attach(bo, &priv->gpu_bo);
1171
1168
                                }
1705
1702
                                                   PICT_FORMAT_B(picture->format));
1706
1703
 
1707
1704
                DBG(("%s: converting to %08x from %08x using composite alpha-fixup\n",
1708
 
                     __FUNCTION__, picture->format));
 
1705
                     __FUNCTION__, (unsigned)picture->format));
1709
1706
 
1710
1707
                tmp = screen->CreatePixmap(screen, w, h, pixmap->drawable.bitsPerPixel, 0);
1711
1708
                if (tmp == NULL)
1726
1723
                                                       pixmap->drawable.depth,
1727
1724
                                                       picture->format),
1728
1725
                                    0, NULL, serverClient, &error);
1729
 
                if (dst == NULL) {
 
1726
                if (src == NULL) {
1730
1727
                        FreePicture(dst, 0);
1731
1728
                        screen->DestroyPixmap(tmp);
1732
1729
                        return 0;
1994
1991
                }
1995
1992
                if (t->damage) {
1996
1993
                        DBG(("%s: combining damage (all? %d), offset=(%d, %d)\n",
1997
 
                             __FUNCTION__, DAMAGE_IS_ALL(t->damage),
 
1994
                             __FUNCTION__, (int)DAMAGE_IS_ALL(t->damage),
1998
1995
                             t->box.x1, t->box.y1));
1999
1996
                        sna_damage_combine(t->real_damage,
2000
1997
                                           DAMAGE_PTR(t->damage),