Skip to content

Commit

Permalink
Merge pull request dolphin-emu#3951 from leoetlino/formatting-fix
Browse files Browse the repository at this point in the history
LightingShaderGen: Fix formatting
  • Loading branch information
degasus authored Jun 27, 2016
2 parents 6ed001a + d9fc1e0 commit c4838b9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Source/Core/VideoCommon/LightingShaderGen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ static void GenerateLightShader(ShaderCode& object, const LightingUidData& uid_d
LIGHT_DIR_PARAMS(index));
object.Write("cosAttn = " LIGHT_COSATT ".xyz;\n", LIGHT_COSATT_PARAMS(index));
object.Write("distAttn = %s(" LIGHT_DISTATT ".xyz);\n",
(diffusefunc == LIGHTDIF_NONE) ? "" : "normalize", LIGHT_DISTATT_PARAMS(index));
(diffusefunc == LIGHTDIF_NONE) ? "" : "normalize", LIGHT_DISTATT_PARAMS(index));
object.Write("attn = max(0.0f, dot(cosAttn, float3(1.0, attn, attn*attn))) / dot(distAttn, "
"float3(1.0, attn, attn*attn));\n");
break;
Expand Down Expand Up @@ -71,8 +71,8 @@ static void GenerateLightShader(ShaderCode& object, const LightingUidData& uid_d
// materials name is I_MATERIALS in vs and I_PMATERIALS in ps
// inColorName is color in vs and colors_ in ps
// dest is o.colors_ in vs and colors_ in ps
void GenerateLightingShaderCode(ShaderCode& object, const LightingUidData& uid_data,
int components, const char* inColorName, const char* dest)
void GenerateLightingShaderCode(ShaderCode& object, const LightingUidData& uid_data, int components,
const char* inColorName, const char* dest)
{
for (unsigned int j = 0; j < xfmem.numChan.numColorChans; j++)
{
Expand Down

0 comments on commit c4838b9

Please sign in to comment.