← Back to branch summary

~ubuntu-branches/debian/jessie/xserver-xorg-video-intel/jessie

« back to all changes in this revision

Viewing changes to src/sna/sna_dri.c

  • Committer: Package Import Robot
  • Author(s): Cyril Brulebois
  • Date: 2012-06-12 20:30:51 UTC
  • mfrom: (26.1.16 sid)
  • Revision ID: package-import@ubuntu.com-20120612203051-mex5136iqfafp06b
Tags: 2:2.19.0-3
http://bugs.debian.org/677206
* Add patch to avoid X segfaults with Driver-less Device sections in
  xorg.conf (Closes: #677206):
  - 0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/sna/sna_dri.c
1210
1210
                }
1211
1211
                break;
1212
1212
 
1213
 
#if DRI2INFOREC_VERSION >= 7
 
1213
#if USE_ASYNC_SWAP && DRI2INFOREC_VERSION >= 7
1214
1214
        case DRI2_ASYNC_FLIP:
1215
1215
                DBG(("%s: async swap flip completed on pipe %d, pending? %d, new? %d\n",
1216
1216
                     __FUNCTION__, flip->pipe,
1698
1698
        return TRUE;
1699
1699
}
1700
1700
 
1701
 
#if DRI2INFOREC_VERSION >= 7
 
1701
#if USE_ASYNC_SWAP && DRI2INFOREC_VERSION >= 7
1702
1702
static Bool
1703
1703
sna_dri_async_swap(ClientPtr client, DrawablePtr draw,
1704
1704
                   DRI2BufferPtr front, DRI2BufferPtr back,
2078
2078
        info.ReuseBufferNotify = NULL;
2079
2079
#endif
2080
2080
 
2081
 
#if DRI2INFOREC_VERSION >= 7
 
2081
#if USE_ASYNC_SWAP && DRI2INFOREC_VERSION >= 7
2082
2082
        info.version = 7;
2083
2083
        info.AsyncSwap = sna_dri_async_swap;
2084
2084
#endif