llvmpipe: align with u_cpu_detect struct changes

Cc: mesa-stable # 24.3
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Signed-off-by: David Heidelberg <david@ixit.cz>
(cherry picked from commit d21f7f75ff)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32261>
This commit is contained in:
David Heidelberg 2024-11-12 18:44:27 -05:00 committed by Dylan Baker
parent 9116861d3c
commit a725b1373e
2 changed files with 4 additions and 4 deletions

View file

@ -244,7 +244,7 @@
"description": "llvmpipe: align with u_cpu_detect struct changes",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

View file

@ -1001,11 +1001,11 @@ update_cache_sha1_cpu(struct mesa_sha1 *ctx)
const struct util_cpu_caps_t *cpu_caps = util_get_cpu_caps();
/*
* Don't need the cpu cache affinity stuff. The rest
* is contained in first 6 dwords.
* is contained in first 5 dwords.
*/
STATIC_ASSERT(offsetof(struct util_cpu_caps_t, num_L3_caches)
== 6 * sizeof(uint32_t));
_mesa_sha1_update(ctx, cpu_caps, 6 * sizeof(uint32_t));
== 5 * sizeof(uint32_t));
_mesa_sha1_update(ctx, cpu_caps, 5 * sizeof(uint32_t));
}