diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-18 18:57:46 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-18 19:03:02 +0100 |
| commit | 89ab66448e1bcd78caab6678261c2885dcff741c (patch) | |
| tree | be36d7e3eba3f64e54da34ff7ba64b3eb14e56aa /src/glx/x11/dri2_glx.c | |
| parent | 1074e8e4e47bb4af73c7ef730d0fec40e826cc7e (diff) | |
| parent | 5e530d8384b0d9bb867d6407315587c84a443902 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/trivial/Makefile
src/mesa/glapi/glthread.c
Diffstat (limited to 'src/glx/x11/dri2_glx.c')
| -rw-r--r-- | src/glx/x11/dri2_glx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/glx/x11/dri2_glx.c b/src/glx/x11/dri2_glx.c index c56adfa558..3c366bfa1e 100644 --- a/src/glx/x11/dri2_glx.c +++ b/src/glx/x11/dri2_glx.c @@ -211,6 +211,9 @@ dri2GetBuffers(__DRIdrawable *driDrawable, buffers = DRI2GetBuffers(pdraw->base.psc->dpy, pdraw->base.xDrawable, width, height, attachments, count, out_count); + if (buffers == NULL) + return NULL; + pdraw->width = *width; pdraw->height = *height; |