Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #634 from degasus/pixelshader-align
PixelShaderGen: fix indentation
  • Loading branch information
delroth committed Jul 16, 2014
2 parents 2daa83d + 01fd96a commit ebec4b0
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Source/Core/VideoCommon/PixelShaderGen.cpp
Expand Up @@ -405,7 +405,7 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T
{
out.Write("uv%d.xy", i);
}
out.Write(" * " I_TEXDIMS"[%d].zw * 128.0);\n\n", i);
out.Write(" * " I_TEXDIMS"[%d].zw * 128.0);\n", i);
// TODO: S24 overflows here?
}
}
Expand Down Expand Up @@ -575,7 +575,7 @@ static inline void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, AP
if (!bHasTexCoord)
texcoord = 0;

out.Write("\t// TEV stage %d\n", n);
out.Write("\n\t// TEV stage %d\n", n);

uid_data.stagehash[n].hasindstage = bHasIndStage;
uid_data.stagehash[n].tevorders_texcoord = texcoord;
Expand Down Expand Up @@ -780,10 +780,10 @@ static inline void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, AP
out.SetConstantsUsed(C_COLORS+ac.dest, C_COLORS+ac.dest);


out.Write("tevin_a = int4(%s, %s)&255;\n", tevCInputTable[cc.a], tevAInputTable[ac.a]);
out.Write("tevin_b = int4(%s, %s)&255;\n", tevCInputTable[cc.b], tevAInputTable[ac.b]);
out.Write("tevin_c = int4(%s, %s)&255;\n", tevCInputTable[cc.c], tevAInputTable[ac.c]);
out.Write("tevin_d = int4(%s, %s);\n", tevCInputTable[cc.d], tevAInputTable[ac.d]);
out.Write("\ttevin_a = int4(%s, %s)&255;\n", tevCInputTable[cc.a], tevAInputTable[ac.a]);
out.Write("\ttevin_b = int4(%s, %s)&255;\n", tevCInputTable[cc.b], tevAInputTable[ac.b]);
out.Write("\ttevin_c = int4(%s, %s)&255;\n", tevCInputTable[cc.c], tevAInputTable[ac.c]);
out.Write("\ttevin_d = int4(%s, %s);\n", tevCInputTable[cc.d], tevAInputTable[ac.d]);

out.Write("\t// color combine\n");
out.Write("\t%s = clamp(", tevCOutputTable[cc.dest]);
Expand Down Expand Up @@ -844,7 +844,7 @@ static inline void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, AP
else
out.Write(", -1024, 1023)");

out.Write(";\n\n");
out.Write(";\n");
}

template<class T>
Expand Down Expand Up @@ -980,7 +980,7 @@ static inline void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_T
out.Write("\t\treturn;\n");
}

out.Write("}\n");
out.Write("\t}\n");
}

static const char *tevFogFuncsTable[] =
Expand Down

0 comments on commit ebec4b0

Please sign in to comment.