OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llvmpipe: fixup context leaks.

Browse Source 
Make sure we unreference all resources for all shaders on context
destruction.

Fixes: eb5227173f (llvmpipe: add support for tessellation shaders)

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4560>
This commit is contained in:
Dave Airlie
2020-04-15 07:17:20 +10:00
parent 68b40cfe27
commit f4edc6f8bd
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gallium/drivers/llvmpipe/lp_context.c
View File

@@ -55,7 +55,7 @@
static void llvmpipe_destroy( struct pipe_context *pipe ) static void llvmpipe_destroy( struct pipe_context *pipe )
{ {
struct llvmpipe_context *llvmpipe = llvmpipe_context( pipe ); struct llvmpipe_context *llvmpipe = llvmpipe_context( pipe );
uint i, j; uint i;
lp_print_counters(); lp_print_counters();
@@ -80,21 +80,18 @@ static void llvmpipe_destroy( struct pipe_context *pipe )
pipe_surface_reference(&llvmpipe->framebuffer.zsbuf, NULL); pipe_surface_reference(&llvmpipe->framebuffer.zsbuf, NULL);
for (i = 0; i < ARRAY_SIZE(llvmpipe->sampler_views[0]); i++) { for (enum pipe_shader_type s = PIPE_SHADER_VERTEX; s < PIPE_SHADER_TYPES; s++) {
pipe_sampler_view_reference(&llvmpipe->sampler_views[PIPE_SHADER_FRAGMENT][i], NULL); for (i = 0; i < ARRAY_SIZE(llvmpipe->sampler_views[0]); i++) {
} pipe_sampler_view_reference(&llvmpipe->sampler_views[s][i], NULL);
}
for (i = 0; i < ARRAY_SIZE(llvmpipe->sampler_views[0]); i++) { for (i = 0; i < LP_MAX_TGSI_SHADER_IMAGES; i++) {
pipe_sampler_view_reference(&llvmpipe->sampler_views[PIPE_SHADER_VERTEX][i], NULL); pipe_resource_reference(&llvmpipe->images[s][i].resource, NULL);
} }
for (i = 0; i < LP_MAX_TGSI_SHADER_BUFFERS; i++) {
for (i = 0; i < ARRAY_SIZE(llvmpipe->sampler_views[0]); i++) { pipe_resource_reference(&llvmpipe->ssbos[s][i].buffer, NULL);
pipe_sampler_view_reference(&llvmpipe->sampler_views[PIPE_SHADER_GEOMETRY][i], NULL); }
} for (i = 0; i < ARRAY_SIZE(llvmpipe->constants[s]); i++) {
pipe_resource_reference(&llvmpipe->constants[s][i].buffer, NULL);
for (i = 0; i < ARRAY_SIZE(llvmpipe->constants); i++) {
for (j = 0; j < ARRAY_SIZE(llvmpipe->constants[i]); j++) {
pipe_resource_reference(&llvmpipe->constants[i][j].buffer, NULL);
} }
} }