From 62d223addaf773231f2fad3c9721d3e68f81fee3 Mon Sep 17 00:00:00 2001
From: Hans-Kristian Arntzen <hans-kristian.arntzen@arm.com>
Date: Wed, 21 Sep 2016 08:20:04 +0200
Subject: [PATCH] Comment the workaround for layout_for_variable.

---
 spirv_glsl.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp
index ec81bf5c..b1efe2e9 100644
--- a/spirv_glsl.cpp
+++ b/spirv_glsl.cpp
@@ -804,7 +804,11 @@ bool CompilerGLSL::ssbo_is_std430_packing(const SPIRType &type)
 
 string CompilerGLSL::layout_for_variable(const SPIRVariable &var)
 {
-	if (is_legacy_es() || (!options.es && options.version < 130))
+	// FIXME: Come up with a better solution for when to disable layouts.
+	// Having layouts depend on extensions as well as which types
+	// of layouts are used. For now, the simple solution is to just disable
+	// layouts for legacy versions.
+	if (is_legacy())
 		return "";
 
 	vector<string> attr;