diff options
| author | Nicolai Hähnle <[email protected]> | 2016-02-03 18:02:55 +0100 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2016-02-05 09:21:51 -0500 |
| commit | 7e9670c8bc9422296ce07dce99e1d266063952c3 (patch) | |
| tree | 64d989418067c7b462bb86e64df079f091656a12 /src | |
| parent | a01e44adcc100a03d5aae0e4d668bf3ae462fc1b (diff) | |
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 <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 84dfc703215..f2b607c3a1d 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -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: |