Mesa (master): glsl_type: Add packed to structure type comparison for hash map
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Sep 18 19:54:05 UTC 2020
Module: Mesa
Branch: master
Commit: 9aa86eb61aa64411b4c16d359467312f0f2729a0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9aa86eb61aa64411b4c16d359467312f0f2729a0
Author: Jesse Natalie <jenatali at microsoft.com>
Date: Thu Sep 17 15:07:53 2020 -0700
glsl_type: Add packed to structure type comparison for hash map
Fixes: 659f333b3a4ff "glsl: add packed for struct types"
Reviewed-by: Marek Olák <marek.olsak at amd.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6767>
---
src/compiler/glsl_types.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp
index 2a77b075c28..e160a479cbd 100644
--- a/src/compiler/glsl_types.cpp
+++ b/src/compiler/glsl_types.cpp
@@ -1143,6 +1143,9 @@ glsl_type::record_compare(const glsl_type *b, bool match_name,
if (this->explicit_alignment != b->explicit_alignment)
return false;
+ if (this->packed != b->packed)
+ return false;
+
/* From the GLSL 4.20 specification (Sec 4.2):
*
* "Structures must have the same name, sequence of type names, and
More information about the mesa-commit
mailing list