mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-02 07:36:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Further refactoring attempt"

Browse source 
This reverts commit 334ca8df73c2686ac1c793313fc70c97a6142bea.
This commit is contained in:
Pokechu22 2022-02-27 12:06:03 -08:00
commit c63ea902f0
1 changed files with 23 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

55
Source/Core/VideoCommon/LightingShaderGen.cpp
View file

@ -22,48 +22,25 @@ static void GenerateLightShader(ShaderCode& object, const LightingUidData& uid_d
object.Write(" float3 ldir = " LIGHT_POS ".xyz - pos.xyz;\n", LIGHT_POS_PARAMS(index)); object.Write(" float3 ldir = " LIGHT_POS ".xyz - pos.xyz;\n", LIGHT_POS_PARAMS(index));
object.Write(" float dist2 = dot(ldir, ldir);\n" object.Write(" float dist2 = dot(ldir, ldir);\n"
" float dist = sqrt(dist2);\n" " float dist = sqrt(dist2);\n"
" ldir = ldir / dist;\n\n"); " ldir = ldir / dist;\n");
switch (diffuse_func)
{
case DiffuseFunc::None:
object.Write(" float diffuse = 1.0;\n\n");
break;
case DiffuseFunc::Sign:
default: // Confirmed by hardware testing that invalid values use this
object.Write(" float diffuse = dot(ldir, _normal);\n\n");
break;
case DiffuseFunc::Clamp:
object.Write(" float diffuse = max(0.0, dot(ldir, _normal));\n\n");
break;
}
switch (attn_func) switch (attn_func)
{ {
case AttenuationFunc::None: case AttenuationFunc::None:
if (diffuse_func == DiffuseFunc::None)
{
object.Write(" float attn = 1.0;\n");
break;
}
else
{
object.Write(" lacc.{} += int{}(round(255 * sign(diffuse)));\n", swizzle,
swizzle_components);
object.Write(" }}\n");
return; // Return, not break!
}
case AttenuationFunc::Dir: case AttenuationFunc::Dir:
object.Write(" float attn = 1.0;\n"); object.Write(" float attn = 1.0;\n");
break; break;
case AttenuationFunc::Spec: case AttenuationFunc::Spec:
object.Write(" float cosine = 0.0;\n" object.Write(" float cosine = 0.0;\n"
" // Compute the cosine of the angle between the object normal\n" " // Ensure that the object is facing the light\n"
" // and the half-angle direction for the viewer\n" " if (dot(_normal, ldir) >= 0.0) {{\n"
" // (assuming the half-angle direction is a unit vector)\n" " // Compute the cosine of the angle between the object normal\n"
" cosine = max(0.0, dot(_normal, -" LIGHT_DIR ".xyz));\n", " // and the half-angle direction for the viewer\n"
" // (assuming the half-angle direction is a unit vector)\n"
" cosine = max(0.0, dot(_normal, " LIGHT_DIR ".xyz));\n",
LIGHT_DIR_PARAMS(index)); LIGHT_DIR_PARAMS(index));
object.Write(" // Specular lights use the angle for the denominator as well\n" object.Write(" }}\n"
" // Specular lights use the angle for the denominator as well\n"
" dist = cosine;\n" " dist = cosine;\n"
" dist2 = dist * dist;\n"); " dist2 = dist * dist;\n");
break; break;
@ -99,6 +76,20 @@ static void GenerateLightShader(ShaderCode& object, const LightingUidData& uid_d
" float attn = max(0.0f, numerator / denominator);\n"); " float attn = max(0.0f, numerator / denominator);\n");
} }
switch (diffuse_func)
{
case DiffuseFunc::None:
object.Write(" float diffuse = 1.0;\n");
break;
case DiffuseFunc::Sign:
default: // Confirmed by hardware testing that invalid values use this
object.Write(" float diffuse = dot(ldir, _normal);\n");
break;
case DiffuseFunc::Clamp:
object.Write(" float diffuse = max(0.0, dot(ldir, _normal));\n");
break;
}
object.Write(" lacc.{} += int{}(round(attn * diffuse * float{}(" LIGHT_COL ")));\n", swizzle, object.Write(" lacc.{} += int{}(round(attn * diffuse * float{}(" LIGHT_COL ")));\n", swizzle,
swizzle_components, swizzle_components, LIGHT_COL_PARAMS(index, swizzle)); swizzle_components, swizzle_components, LIGHT_COL_PARAMS(index, swizzle));
object.Write(" }}\n"); object.Write(" }}\n");