From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Tue, 19 Jan 2016 23:49:54 +0000 (+1100)
Subject: glsl: add missing explicit_image_format flag to has_layout()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0a6a05c8eaeda570891fdece2d86e8e0b0e4d56f;p=mesa.git

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.janes@intel.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
---

diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index cf494d96724..e0e331152dd 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