Commit 8a2465e3 authored by Lionel Landwerlin's avatar Lionel Landwerlin

radeonsi: take reference glsl types for compile threads

An application quitting before the destroying its GL context and
binding a NULL context might still have a radeonsi compiler thread
running and potentially still accessing the types.

Therefore take a reference for the duration of the threads' lifetime.

v2: Only ref the glsl types, the builtins should be used by the time
    shader data gets to a gallium driver.
Signed-off-by: Lionel Landwerlin's avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
parent e4da8b9c
Pipeline #57697 passed with stages
in 41 minutes and 1 second
......@@ -743,6 +743,9 @@ static void si_destroy_screen(struct pipe_screen* pscreen)
util_queue_destroy(&sscreen->shader_compiler_queue);
util_queue_destroy(&sscreen->shader_compiler_queue_low_priority);
/* Release the reference on glsl types of the compiler threads. */
glsl_type_singleton_decref();
for (i = 0; i < ARRAY_SIZE(sscreen->compiler); i++)
si_destroy_compiler(&sscreen->compiler[i]);
......@@ -1029,12 +1032,16 @@ radeonsi_screen_create_impl(struct radeon_winsys *ws,
num_comp_lo_threads = MIN2(num_comp_lo_threads,
ARRAY_SIZE(sscreen->compiler_lowp));
/* Take a reference on the glsl types for the compiler threads. */
glsl_type_singleton_init_or_ref();
if (!util_queue_init(&sscreen->shader_compiler_queue, "sh",
64, num_comp_hi_threads,
UTIL_QUEUE_INIT_RESIZE_IF_FULL |
UTIL_QUEUE_INIT_SET_FULL_THREAD_AFFINITY)) {
si_destroy_shader_cache(sscreen);
FREE(sscreen);
glsl_type_singleton_decref();
return NULL;
}
......@@ -1046,6 +1053,7 @@ radeonsi_screen_create_impl(struct radeon_winsys *ws,
UTIL_QUEUE_INIT_USE_MINIMUM_PRIORITY)) {
si_destroy_shader_cache(sscreen);
FREE(sscreen);
glsl_type_singleton_decref();
return NULL;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment