NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

zink: reorder glsl_type_singleton_init_or_ref call

Browse source 
this enables the screen destructor to be used on failure cases

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25663>
This commit is contained in:
Mike Blumenkrantz 2023-10-11 12:16:14 -04:00 • committed by Marge Bot
parent fcf3f7d28f
commit 9bb404317e
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/zink/zink_screen.c
View file

@ -3105,6 +3105,7 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev
return NULL;
}
glsl_type_singleton_init_or_ref();
zink_debug = debug_get_option_zink_debug();
if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_AUTO)
zink_descriptor_mode = debug_get_option_zink_descriptor_mode();
@ -3479,7 +3480,6 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev
zink_create_vertex_state, zink_vertex_state_destroy);
screen->base.create_vertex_state = zink_cache_create_vertex_state;
screen->base.vertex_state_destroy = zink_cache_vertex_state_destroy;
glsl_type_singleton_init_or_ref();
zink_synchronization_init(screen);