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 #1715 from Armada651/geom-interface 

VideoCommon: Add in/out qualifiers to centroid storage qualifier.
This commit is contained in:
Markus Wick 2014-12-19 12:41:10 +01:00
parent 02f22152be cdd9e07522
commit ca18e51450
3 changed files with 4 additions and 4 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 VS_OUTPUT o;\n"); out.Write("\tcentroid in VS_OUTPUT o;\n");
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 VS_OUTPUT o;\n"); out.Write("\tcentroid out VS_OUTPUT o;\n");
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 VS_OUTPUT o;\n"); out.Write("\tcentroid in VS_OUTPUT o;\n");
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/VertexShaderGen.cpp
View File

@ -75,7 +75,7 @@ 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 VS_OUTPUT o;\n" "\tcentroid out VS_OUTPUT o;\n"
"};\n"); "};\n");
} }
else else