From e6b2212ec0240c8d00ec2f72b84c037db94bfccb Mon Sep 17 00:00:00 2001 From: Stenzek Date: Tue, 29 Mar 2016 13:35:16 +1000 Subject: ShaderGen: Only specify storage qualifier in interface block when needed Drivers that don't support GL_ARB_shading_language_420pack require that the storage qualifier be specified even when inside an interface block. AMD's driver throws a compile error when "centroid in/out" is used within an interface block. Our previous behavior was to include the storage qualifier regardless, but this wasn't working on AMD, therefore we should check for the presence of the extension and include based on this, instead. --- Source/Core/VideoCommon/GeometryShaderGen.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Source/Core/VideoCommon/GeometryShaderGen.cpp') 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(out, ApiType, "in", GetInterpolationQualifier()); + GenerateVSOutputMembers(out, ApiType, GetInterpolationQualifier(true, true)); out.Write("} vs[%d];\n", vertex_in); out.Write("out VertexData {\n"); - GenerateVSOutputMembers(out, ApiType, "out", GetInterpolationQualifier()); + GenerateVSOutputMembers(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"); -- cgit v1.2.3