AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llvmpipe: Lock shader access to sample_functions

Browse Source 
sample_functions can be re-allocated.

Fixes: 7ebf7f4 ("llvmpipe: Compile sample functioins on demand")
Reviewed-by: Roland Scheidegger <roland.scheidegger@broadcom.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29699>
This commit is contained in:
Konstantin Seurer
2024-06-08 11:26:53 +02:00
committed by Marge Bot
parent b06661aaf3
commit 9e4a44d172
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/llvmpipe/lp_texture_handle.c
+3 -3
View File
@@ -507,14 +507,14 @@ static uint64_t
get_sample_function(uint64_t _matrix, uint64_t _texture_functions, uint64_t _sampler_desc, uint32_t sample_key)
{
struct lp_sampler_matrix *matrix = (void *)(uintptr_t)_matrix;
struct lp_texture_functions *texture_functions = (void *)(uintptr_t)_texture_functions;
struct lp_descriptor *sampler_desc = (void *)(uintptr_t)_sampler_desc;
uint32_t sampler_index = sampler_desc->texture.sampler_index;
void *key = &texture_functions->sample_functions[sampler_index][sample_key];
simple_mtx_lock(&matrix->lock);
struct lp_texture_functions *texture_functions = (void *)(uintptr_t)_texture_functions;
void *key = &texture_functions->sample_functions[sampler_index][sample_key];
void *result;
struct hash_entry *entry = _mesa_hash_table_search(matrix->cache, key);
if (entry) {