fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/mesa: fix OOM failure in bitmap code

Browse source
This commit is contained in:
Brian Paul 2011-11-10 09:50:42 -07:00
parent 97dedfda5f
commit 2551ff5900
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mesa/state_tracker/st_cb_bitmap.c
View file

@ -376,6 +376,10 @@ setup_bitmap_vertex_data(struct st_context *st, bool normalized,
PIPE_USAGE_STREAM,
max_slots *
sizeof(st->bitmap.vertices));
if (!st->bitmap.vbuf) {
/* out of memory */
return 0;
}
}
/* Positions are in clip coords since we need to do clipping in case
@ -547,11 +551,12 @@ draw_bitmap_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z,
sv->texture->target != PIPE_TEXTURE_RECT,
x, y, width, height, z, color);
util_draw_vertex_buffer(pipe, st->cso_context, st->bitmap.vbuf, offset,
PIPE_PRIM_TRIANGLE_FAN,
4, /* verts */
3); /* attribs/vert */
if (st->bitmap.vbuf) {
util_draw_vertex_buffer(pipe, st->cso_context, st->bitmap.vbuf, offset,
PIPE_PRIM_TRIANGLE_FAN,
4, /* verts */
3); /* attribs/vert */
}
/* restore state */
cso_restore_rasterizer(cso);