From cc3c8c241e733e64700361de68ed6a62ab3fbffb Mon Sep 17 00:00:00 2001 From: Giancarlo Devich Date: Tue, 28 Feb 2023 16:38:15 -0800 Subject: [PATCH] d3d12: Use memcmp for full tcs/gs variant keys Part-of: --- src/gallium/drivers/d3d12/d3d12_gs_variant.cpp | 3 +-- src/gallium/drivers/d3d12/d3d12_tcs_variant.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/d3d12/d3d12_gs_variant.cpp b/src/gallium/drivers/d3d12/d3d12_gs_variant.cpp index 7c2842e8959..92d49301d1e 100644 --- a/src/gallium/drivers/d3d12/d3d12_gs_variant.cpp +++ b/src/gallium/drivers/d3d12/d3d12_gs_variant.cpp @@ -465,8 +465,7 @@ hash_gs_variant_key(const void *key) static bool equals_gs_variant_key(const void *a, const void *b) { - return memcmp(a, b, offsetof(d3d12_gs_variant_key, varyings)) == 0 - && d3d12_compare_varying_info(((d3d12_gs_variant_key*)a)->varyings, ((d3d12_gs_variant_key*)b)->varyings); + return memcmp(a, b, sizeof(d3d12_gs_variant_key)) == 0; } void diff --git a/src/gallium/drivers/d3d12/d3d12_tcs_variant.cpp b/src/gallium/drivers/d3d12/d3d12_tcs_variant.cpp index 52a34e6f064..e3dd76dc045 100644 --- a/src/gallium/drivers/d3d12/d3d12_tcs_variant.cpp +++ b/src/gallium/drivers/d3d12/d3d12_tcs_variant.cpp @@ -41,8 +41,7 @@ hash_tcs_variant_key(const void *key) static bool equals_tcs_variant_key(const void *a, const void *b) { - return memcmp(a, b, offsetof(d3d12_tcs_variant_key, varyings)) == 0 - && d3d12_compare_varying_info(((d3d12_tcs_variant_key*)a)->varyings, ((d3d12_tcs_variant_key*)b)->varyings); + return memcmp(a, b, sizeof(d3d12_tcs_variant_key)) == 0; } void