diff options
| author | Brian Paul <brianp@vmware.com> | 2013-01-24 14:51:05 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-01-25 15:41:40 -0700 |
| commit | 8c3f9ea07392177b6de9d946d40f97128fa51632 (patch) | |
| tree | 17fbe09d0959a982397faac29a0ebc4fa62cbf73 /src/mesa/state_tracker/st_cb_drawtex.c | |
| parent | 68a097596efdf314ec60487a1761cac789ae2367 (diff) | |
| download | external_mesa3d-8c3f9ea07392177b6de9d946d40f97128fa51632.zip external_mesa3d-8c3f9ea07392177b6de9d946d40f97128fa51632.tar.gz external_mesa3d-8c3f9ea07392177b6de9d946d40f97128fa51632.tar.bz2 | |
st/mesa: do proper error checking for u_upload_alloc() calls
We weren't properly checking the return value of these calls (and
calls to u_upload_data()) to detect OOM errors.
Note: This is a candidate for the 9.0 branch.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/mesa/state_tracker/st_cb_drawtex.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_drawtex.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_cb_drawtex.c b/src/mesa/state_tracker/st_cb_drawtex.c index 269068d..5ca0970 100644 --- a/src/mesa/state_tracker/st_cb_drawtex.c +++ b/src/mesa/state_tracker/st_cb_drawtex.c @@ -148,10 +148,9 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat *vbuf = NULL; GLuint attr; - u_upload_alloc(st->uploader, 0, - numAttribs * 4 * 4 * sizeof(GLfloat), - &offset, &vbuffer, (void**)&vbuf); - if (!vbuffer) { + if (u_upload_alloc(st->uploader, 0, + numAttribs * 4 * 4 * sizeof(GLfloat), + &offset, &vbuffer, (void **) &vbuf) != PIPE_OK) { return; } |