Merge pull request #3757 from stenzek/amd-glsl-storage-qualifier

ShaderGen: Handle AMD bug with storage qualifiers in interface blocks

1 files changed, 3 insertions, 4 deletions

diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp
index de76557d5e..4d551f5d16 100644
--- a/Source/Core/VideoCommon/GeometryShaderGen.cpp
+++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp
@@ -90,16 +90,15 @@ static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
 		if (g_ActiveConfig.backend_info.bSupportsGSInstancing)
 			out.Write("#define InstanceID gl_InvocationID\n");
 
-		out.Write("// The interface block qualifier is duplicated to its member due to Apple OS X bug 24983074\n");
 		out.Write("in VertexData {\n");
-		GenerateVSOutputMembers<T>(out, ApiType, "in", GetInterpolationQualifier());
+		GenerateVSOutputMembers<T>(out, ApiType, GetInterpolationQualifier(true, true));
 		out.Write("} vs[%d];\n", vertex_in);
 
 		out.Write("out VertexData {\n");
-		GenerateVSOutputMembers<T>(out, ApiType, "out", GetInterpolationQualifier());
+		GenerateVSOutputMembers<T>(out, ApiType, GetInterpolationQualifier(true, false));
 
 		if (g_ActiveConfig.iStereoMode > 0)
-			out.Write("\tflat out int layer;\n");
+			out.Write("\tflat int layer;\n");
 
 		out.Write("} ps;\n");