Module: Mesa
Branch: master
Commit: 0a6a05c8eaeda570891fdece2d86e8e0b0e4d56f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a6a05c8eaeda570891fdece2d86e8e0b0e4d56f
Author: Timothy Arceri <timothy.arc...@collabora.com>
Date: Wed Jan 20 10:49:54 2016 +1100
glsl: add missing explicit_image_format flag to has_layout()
Fixes piglit regression after fixes to duplicate layout rules.
Previously catching multiple layouts was relying on the code
meant to catch duplicates within a single layout(...), this
change triggers the rules for multiple layouts.
Cc: Mark Janes <mark.a.ja...@intel.com>
Reviewed-by: Francisco Jerez <curroje...@riseup.net>
---
src/glsl/ast_type.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index cf494d9..e0e3311 100644
--- a/src/glsl/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
@@ -74,6 +74,7 @@ ast_type_qualifier::has_layout() const
|| this->flags.q.row_major
|| this->flags.q.packed
|| this->flags.q.explicit_location
+ || this->flags.q.explicit_image_format
|| this->flags.q.explicit_index
|| this->flags.q.explicit_binding
|| this->flags.q.explicit_offset
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
