KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/mesa: bail out of try_pbo_upload_common when constant upload fails 

Also fixes a resource leak when an upload_mgr is used for constants.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle 2016-02-03 18:02:55 +01:00
parent a01e44adcc
commit 7e9670c8bc
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/state_tracker/st_cb_texture.c
View File

@ -1434,6 +1434,9 @@ try_pbo_upload_common(struct gl_context *ctx,
u_upload_data(st->constbuf_uploader, 0, sizeof(constants),
st->ctx->Const.UniformBufferOffsetAlignment,
&constants, &cb.buffer_offset, &cb.buffer);
if (!cb.buffer)
goto fail_constant_upload;
u_upload_unmap(st->constbuf_uploader);
} else {
cb.buffer = NULL;
@ -1444,6 +1447,8 @@ try_pbo_upload_common(struct gl_context *ctx,
cso_save_constant_buffer_slot0(st->cso_context, PIPE_SHADER_FRAGMENT);
cso_set_constant_buffer(st->cso_context, PIPE_SHADER_FRAGMENT, 0, &cb);
pipe_resource_reference(&cb.buffer, NULL);
}
/* Framebuffer_state */
@ -1524,6 +1529,7 @@ try_pbo_upload_common(struct gl_context *ctx,
cso_restore_fragment_shader(st->cso_context);
cso_restore_stream_outputs(st->cso_context);
cso_restore_constant_buffer_slot0(st->cso_context, PIPE_SHADER_FRAGMENT);
fail_constant_upload:
cso_restore_vertex_elements(st->cso_context);
cso_restore_aux_vertex_buffer_slot(st->cso_context);
fail_vertex_upload: