st/mesa: move out of memory check in st_draw_vbo()
Before we were only checking the st->vertex_array_out_of_memory flag after updating array state. But if there's two consecutive glDrawArrays calls and the first one is skipped because of OOM, the second one should be skipped too. Cc: 9.2 <mesa-stable@lists.freedesktop.org> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
@@ -210,9 +210,6 @@ st_draw_vbo(struct gl_context *ctx,
|
||||
if (st->dirty.st || ctx->NewDriverState) {
|
||||
st_validate_state(st);
|
||||
|
||||
if (st->vertex_array_out_of_memory)
|
||||
return;
|
||||
|
||||
#if 0
|
||||
if (MESA_VERBOSE & VERBOSE_GLSL) {
|
||||
check_uniforms(ctx);
|
||||
@@ -222,6 +219,10 @@ st_draw_vbo(struct gl_context *ctx,
|
||||
#endif
|
||||
}
|
||||
|
||||
if (st->vertex_array_out_of_memory) {
|
||||
return;
|
||||
}
|
||||
|
||||
util_draw_init_info(&info);
|
||||
|
||||
if (ib) {
|
||||
|
||||
Reference in New Issue
Block a user