gallium: Fix leak of currently bound UBOs at CSO context destruction.
Cc: mesa-stable Reviewed-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7695>
This commit is contained in:
parent
d90107a200
commit
daaf5f1d18
|
@ -382,6 +382,8 @@ void cso_destroy_context( struct cso_context *ctx )
|
|||
PIPE_SHADER_CAP_MAX_SAMPLER_VIEWS);
|
||||
int maxssbo = scr->get_shader_param(scr, sh,
|
||||
PIPE_SHADER_CAP_MAX_SHADER_BUFFERS);
|
||||
int maxcb = scr->get_shader_param(scr, sh,
|
||||
PIPE_SHADER_CAP_MAX_CONST_BUFFERS);
|
||||
assert(maxsam <= PIPE_MAX_SAMPLERS);
|
||||
assert(maxview <= PIPE_MAX_SHADER_SAMPLER_VIEWS);
|
||||
assert(maxssbo <= PIPE_MAX_SHADER_BUFFERS);
|
||||
|
@ -394,6 +396,9 @@ void cso_destroy_context( struct cso_context *ctx )
|
|||
if (maxssbo > 0) {
|
||||
ctx->pipe->set_shader_buffers(ctx->pipe, sh, 0, maxssbo, ssbos, 0);
|
||||
}
|
||||
for (int i = 0; i < maxcb; i++) {
|
||||
ctx->pipe->set_constant_buffer(ctx->pipe, sh, i, NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -404,17 +409,13 @@ void cso_destroy_context( struct cso_context *ctx )
|
|||
ctx->pipe->set_constant_buffer(ctx->pipe, PIPE_SHADER_VERTEX, 0, NULL);
|
||||
if (ctx->has_geometry_shader) {
|
||||
ctx->pipe->bind_gs_state(ctx->pipe, NULL);
|
||||
ctx->pipe->set_constant_buffer(ctx->pipe, PIPE_SHADER_GEOMETRY, 0, NULL);
|
||||
}
|
||||
if (ctx->has_tessellation) {
|
||||
ctx->pipe->bind_tcs_state(ctx->pipe, NULL);
|
||||
ctx->pipe->set_constant_buffer(ctx->pipe, PIPE_SHADER_TESS_CTRL, 0, NULL);
|
||||
ctx->pipe->bind_tes_state(ctx->pipe, NULL);
|
||||
ctx->pipe->set_constant_buffer(ctx->pipe, PIPE_SHADER_TESS_EVAL, 0, NULL);
|
||||
}
|
||||
if (ctx->has_compute_shader) {
|
||||
ctx->pipe->bind_compute_state(ctx->pipe, NULL);
|
||||
ctx->pipe->set_constant_buffer(ctx->pipe, PIPE_SHADER_COMPUTE, 0, NULL);
|
||||
}
|
||||
ctx->pipe->bind_vertex_elements_state( ctx->pipe, NULL );
|
||||
|
||||
|
|
Loading…
Reference in New Issue