diff options
| author | Brian Paul <[email protected]> | 2005-12-02 19:41:43 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2005-12-02 19:41:43 +0000 |
| commit | 99f13343cf270d8dfde8445ae363d9b05256e05b (patch) | |
| tree | fe00b079a35d0d828259307a897920768f7b2fde /src/mesa/drivers/x11/xm_buffer.c | |
| parent | 1b3128cc9a6b51874bf98871ec1b171049770d71 (diff) | |
Fix two failures encountered when running out of memory during XImage
allocation.
Append \n to _mesa_warning() strings.
Diffstat (limited to 'src/mesa/drivers/x11/xm_buffer.c')
| -rw-r--r-- | src/mesa/drivers/x11/xm_buffer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c index 64a920da2b1..8067b648407 100644 --- a/src/mesa/drivers/x11/xm_buffer.c +++ b/src/mesa/drivers/x11/xm_buffer.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.3 + * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * @@ -98,7 +98,8 @@ xmesa_alloc_back_storage(GLcontext *ctx, struct gl_renderbuffer *rb, xrb->origin4 = (GLuint *) xrb->ximage->data + xrb->width4 * (height - 1); } else { - assert(xrb->pixmap); + /* this assertion will fail if we happend to run out of memory */ + /*assert(xrb->pixmap);*/ } return GL_TRUE; |