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

nir: Stabilize compact_components sort

Browse Source 
Incorporate location_frac into qsort comparison. qsort is not required
to be stable, and MSVC implementation is not.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7399>
This commit is contained in:
James Park
2020-11-01 15:34:28 -08:00
committed by Marge Bot
parent aaa94d92d5
commit ce5e2e2131
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/nir/nir_linking_helpers.c
View File

@@ -475,7 +475,11 @@ cmp_varying_component(const void *comp1_v, const void *comp2_v)
return comp1->interp_loc - comp2->interp_loc;
/* If everything else matches just use the original location to sort */
return comp1->var->data.location - comp2->var->data.location;
const struct nir_variable_data *const data1 = &comp1->var->data;
const struct nir_variable_data *const data2 = &comp2->var->data;
if (data1->location != data2->location)
return data1->location - data2->location;
return (int)data1->location_frac - (int)data2->location_frac;
}
static void