diff options
| author | Julien Cristau <jcristau@debian.org> | 2009-09-14 15:28:00 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2009-09-14 15:29:02 +0200 |
| commit | 31c620f190e8bf9afa44962999020356dcfde764 (patch) | |
| tree | 534d67d2f651c509513e789d682bac72c6e3291f /hw | |
| parent | e97e3ba1b40223b0f60fdc019ada16f46052c29f (diff) | |
| parent | 551d149f9a0d4c7e17a27f8c843d789f782a54e1 (diff) | |
Merge branch 'server-1.6-proposed' into debian-unstable
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/dri2/dri2.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c index 580383dbc..3e8a7d4a8 100644 --- a/hw/xfree86/dri2/dri2.c +++ b/hw/xfree86/dri2/dri2.c @@ -190,10 +190,18 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height, int need_fake_front = 0; int have_fake_front = 0; int front_format = 0; - const int dimensions_match = (pDraw->width == pPriv->width) - && (pDraw->height == pPriv->height); + int dimensions_match; int i; + if (!pPriv) { + *width = pDraw->width; + *height = pDraw->height; + *out_count = 0; + return NULL; + } + + dimensions_match = (pDraw->width == pPriv->width) + && (pDraw->height == pPriv->height); buffers = xalloc((count + 1) * sizeof(buffers[0])); |