From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Tue, 29 Dec 2015 10:15:52 +0000 (+1100)
Subject: glsl: enable offset layout qualifier for ARB_enhanced_layouts
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6f45484ac7142d9ccda6ee009a0902147f62c75b;p=mesa.git

glsl: enable offset layout qualifier for ARB_enhanced_layouts

Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
---

diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy
index 9d6ea29355f..2fb0da1f8c0 100644
--- a/src/compiler/glsl/glsl_parser.yy
+++ b/src/compiler/glsl/glsl_parser.yy
@@ -1498,7 +1498,8 @@ layout_qualifier_id:
          $$.binding = $3;
       }
 
-      if (state->has_atomic_counters() &&
+      if ((state->has_atomic_counters() ||
+           state->has_enhanced_layouts()) &&
           match_layout_qualifier("offset", $1, state) == 0) {
          $$.flags.q.explicit_offset = 1;
          $$.offset = $3;