diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-28 07:58:44 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-28 07:58:44 +0100 |
| commit | 39b49babc915183f4d712053b46f0e010427c191 (patch) | |
| tree | b512cf3f17a0defe9e2cd6ababdc9f5337f93d0e /mesalib/src/mesa/state_tracker/st_cb_drawtex.c | |
| parent | 3e3af07f7697e9d23dd62fcf8f3a055602ae3341 (diff) | |
| parent | 69c8cec54b01ed522bf10baf20da70304bac701a (diff) | |
| download | vcxsrv-39b49babc915183f4d712053b46f0e010427c191.tar.gz vcxsrv-39b49babc915183f4d712053b46f0e010427c191.tar.bz2 vcxsrv-39b49babc915183f4d712053b46f0e010427c191.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa mkfontscale pixman git update 28 jan 2013
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_drawtex.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_drawtex.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawtex.c b/mesalib/src/mesa/state_tracker/st_cb_drawtex.c index 269068da2..5ca097004 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_drawtex.c +++ b/mesalib/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; } |