Mesa (9.1): st/mesa: generate GL_OUT_OF_MEMORY if we can' t create the index buffer
Ian Romanick
idr at kemper.freedesktop.org
Wed May 29 20:37:33 UTC 2013
Module: Mesa
Branch: 9.1
Commit: 66ac414c1890a609d21df102c9b48d5c7f6400db
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=66ac414c1890a609d21df102c9b48d5c7f6400db
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 8 10:18:49 2013 -0600
st/mesa: generate GL_OUT_OF_MEMORY if we can't create the index buffer
Before, if we failed to allocate the index buffer we'd silently
return from st_draw_vbo() without drawing anything. We should
raise GL_OUT_OF_MEMORY to give some indication that something went
wrong.
Note: This is a candidate for the stable branches.
Reviewed-by: Marek Olšák <maraeo at gmail.com>
(cherry picked from commit e0144019c08cec64edb78c4f01d78bfbc2aa2edd)
---
src/mesa/state_tracker/st_draw.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index bff8d9b..94e26e2 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -231,7 +231,7 @@ st_draw_vbo(struct gl_context *ctx,
nr_prims);
if (!setup_index_buffer(st, ib, &ibuffer)) {
- /* out of memory */
+ _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBegin/DrawElements/DrawArray");
return;
}
More information about the mesa-commit
mailing list