Merge pull request #18587 from hrydgard/minor-vshader-opt

Minor lighting optimization in vshader
hrydgard · Dec 20, 2023 · e973618 · e973618
2 parents d339a4b + 2238fab
commit e973618
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/GPU/Common/VertexShaderGenerator.cpp b/GPU/Common/VertexShaderGenerator.cpp
@@ -1069,16 +1069,14 @@ bool GenerateVertexShader(const VShaderID &id, char *buffer, const ShaderLanguag
 				p.C("      ldot = u_matspecular.a > 0.0 ? pow(max(ldot, 0.0), u_matspecular.a) : 1.0;\n");
 				p.C("    }\n");
 				p.F("    diffuse = (u_lightdiffuse%s * diffuseColor) * max(ldot, 0.0);\n", iStr);
-				p.C("    if (comp == 0x1u) {\n");  // do specular
-				p.C("      if (ldot >= 0.0) {\n");
-				p.C("        if (u_matspecular.a > 0.0) {\n");
-				p.C("          ldot = dot(normalize(toLight + vec3(0.0, 0.0, 1.0)), worldnormal);\n");
-				p.C("          ldot = pow(max(ldot, 0.0), u_matspecular.a);\n");
-				p.C("        } else {\n");
-				p.C("          ldot = 1.0;\n");
-				p.C("        }\n");
-				p.F("        lightSum1 += u_lightspecular%s * specularColor * ldot * lightScale;\n", iStr);
+				p.C("    if (comp == 0x1u && ldot > 0.0) {\n");  // do specular
+				p.C("      if (u_matspecular.a > 0.0) {\n");
+				p.C("        ldot = dot(normalize(toLight + vec3(0.0, 0.0, 1.0)), worldnormal);\n");
+				p.C("        ldot = pow(ldot, u_matspecular.a);\n");
+				p.C("      } else {\n");
+				p.C("        ldot = 1.0;\n");
 				p.C("      }\n");
+				p.F("      lightSum1 += u_lightspecular%s * specularColor * ldot * lightScale;\n", iStr);
 				p.C("    }\n");
 				p.F("    lightSum0.rgb += (u_lightambient%s * ambientColor.rgb + diffuse) * lightScale;\n", iStr);
 				p.C("  }\n");
@@ -1149,7 +1147,7 @@ bool GenerateVertexShader(const VShaderID &id, char *buffer, const ShaderLanguag
 					p.C("  if (ldot >= 0.0) {\n");
 					p.C("    if (u_matspecular.a > 0.0) {\n");
 					p.C("      ldot = dot(normalize(toLight + vec3(0.0, 0.0, 1.0)), worldnormal);\n");
-					p.C("      ldot = pow(max(ldot, 0.0), u_matspecular.a);\n");
+					p.C("      ldot = pow(ldot, u_matspecular.a);\n");
 					p.C("    } else {\n");
 					p.C("      ldot = 1.0;\n");
 					p.C("    }\n");