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

llvmpipe: Prevent segfault during fs variant cache shrinking.

This commit is contained in:
José Fonseca 2011-09-28 20:23:13 +01:00
parent 47ff3f7cc5
commit b8d1242c0b
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gallium/drivers/llvmpipe/lp_state_fs.c
View File

@ -1366,10 +1366,21 @@ llvmpipe_update_fs(struct llvmpipe_context *lp)
*/
llvmpipe_finish(pipe, __FUNCTION__);
for (i = 0; i < LP_MAX_SHADER_VARIANTS / 4; i++) {
struct lp_fs_variant_list_item *item;
item = last_elem(&lp->fs_variants_list);
llvmpipe_remove_shader_variant(lp, item->base);
/*
* We need to re-check lp->nr_fs_variants because an arbitrarliy large
* number of shader variants (potentially all of them) could be
* pending for destruction on flush.
*/
if (lp->nr_fs_variants >= LP_MAX_SHADER_VARIANTS) {
for (i = 0; i < LP_MAX_SHADER_VARIANTS / 4; i++) {
struct lp_fs_variant_list_item *item;
item = last_elem(&lp->fs_variants_list);
if (!item) {
break;
}
llvmpipe_remove_shader_variant(lp, item->base);
}
}
}