Mesa (master): st: report GL_OUT_OF_MEMORY instead of asserting
Brian Paul
brianp at kemper.freedesktop.org
Tue Apr 21 14:47:19 UTC 2009
Module: Mesa
Branch: master
Commit: 25e3a534035e71bb319d2e11906d376734941a21
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=25e3a534035e71bb319d2e11906d376734941a21
Author: Brian Paul <brianp at vmware.com>
Date: Mon Apr 20 15:03:38 2009 -0600
st: report GL_OUT_OF_MEMORY instead of asserting
---
src/mesa/state_tracker/st_cb_bufferobjects.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
index ea9f73c..a94e11f 100644
--- a/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -169,10 +169,10 @@ st_bufferobj_data(GLcontext *ctx,
st_obj->buffer = pipe_buffer_create( pipe->screen, 32, buffer_usage, size );
- /* We don't seem to have any good way of passing failure to
- * allocate up to Mesa??
- */
- assert(st_obj->buffer);
+ if (!st_obj->buffer) {
+ _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBufferDataARB");
+ return;
+ }
st_obj->size = size;
More information about the mesa-commit
mailing list