Mesa (master): glsl/types: Fix function type comparison function
Jason Ekstrand
jekstrand at kemper.freedesktop.org
Thu Jul 14 17:48:45 UTC 2016
Module: Mesa
Branch: master
Commit: 11ac1c4dbbc9fc41d163fa4d9a76bb73c3907871
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=11ac1c4dbbc9fc41d163fa4d9a76bb73c3907871
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Wed Jul 13 14:25:11 2016 -0700
glsl/types: Fix function type comparison function
It was returning true if the function types have different lengths rather
than false. This was new with the SPIR-V to NIR pass and I thought I'd
fixed it a while ago but it may have gotten lost in rebasing somewhere.
Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Cc: "12.0" <mesa-stable at lists.freedesktop.org>
---
src/compiler/glsl_types.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp
index 066a74e..fa27135 100644
--- a/src/compiler/glsl_types.cpp
+++ b/src/compiler/glsl_types.cpp
@@ -1086,7 +1086,7 @@ function_key_compare(const void *a, const void *b)
const glsl_type *const key2 = (glsl_type *) b;
if (key1->length != key2->length)
- return 1;
+ return false;
return memcmp(key1->fields.parameters, key2->fields.parameters,
(key1->length + 1) * sizeof(*key1->fields.parameters)) == 0;
More information about the mesa-commit
mailing list