ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1717 from Armada651/geom-shaderpack 

VideoCommon: Don't specify the redundant in/out qualifier if GL_ARB_shading_language_420pack is supported.
This commit is contained in:
Ryan Houdek 2014-12-19 15:54:13 -06:00
parent ca18e51450 0d79e8f32b
commit 2a95454c01
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/GeometryShaderGen.cpp
View File

@ -88,11 +88,11 @@ static inline void GenerateGeometryShader(T& out, u32 primitive_type, API_TYPE A
out.Write("#define InstanceID gl_InvocationID\n"); out.Write("#define InstanceID gl_InvocationID\n");
out.Write("in VertexData {\n"); out.Write("in VertexData {\n");
out.Write("\tcentroid in VS_OUTPUT o;\n"); out.Write("\tcentroid %s VS_OUTPUT o;\n", g_ActiveConfig.backend_info.bSupportsBindingLayout ? "" : "in");
out.Write("} vs[%d];\n", vertex_in); out.Write("} vs[%d];\n", vertex_in);
out.Write("out VertexData {\n"); out.Write("out VertexData {\n");
out.Write("\tcentroid out VS_OUTPUT o;\n"); out.Write("\tcentroid %s VS_OUTPUT o;\n", g_ActiveConfig.backend_info.bSupportsBindingLayout ? "" : "out");
if (g_ActiveConfig.iStereoMode > 0) if (g_ActiveConfig.iStereoMode > 0)
out.Write("\tflat int layer;\n"); out.Write("\tflat int layer;\n");

2
Source/Core/VideoCommon/PixelShaderGen.cpp
View File

@ -320,7 +320,7 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T
if (g_ActiveConfig.backend_info.bSupportsGeometryShaders) if (g_ActiveConfig.backend_info.bSupportsGeometryShaders)
{ {
out.Write("in VertexData {\n"); out.Write("in VertexData {\n");
out.Write("\tcentroid in VS_OUTPUT o;\n"); out.Write("\tcentroid %s VS_OUTPUT o;\n", g_ActiveConfig.backend_info.bSupportsBindingLayout ? "" : "in");
if (g_ActiveConfig.iStereoMode > 0) if (g_ActiveConfig.iStereoMode > 0)
out.Write("\tflat int layer;\n"); out.Write("\tflat int layer;\n");

4
Source/Core/VideoCommon/VertexShaderGen.cpp
View File

@ -75,8 +75,8 @@ static inline void GenerateVertexShader(T& out, u32 components, API_TYPE api_typ
if (g_ActiveConfig.backend_info.bSupportsGeometryShaders) if (g_ActiveConfig.backend_info.bSupportsGeometryShaders)
{ {
out.Write("out VertexData {\n" out.Write("out VertexData {\n"
"\tcentroid out VS_OUTPUT o;\n" "\tcentroid %s VS_OUTPUT o;\n"
"};\n"); "};\n", g_ActiveConfig.backend_info.bSupportsBindingLayout ? "" : "out");
} }
else else
{ {