Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup and fix vertex shader

Browse source
This commit is contained in:
BeaR 2013-04-16 19:01:18 +02:00
parent 2347bc877a
commit c9daf8df7b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GPU/GLES/TransformPipeline.cpp
View file

@ -341,7 +341,7 @@ void Lighter::Light(float colorOut0[4], float colorOut1[4], const float colorIn[
if (dot > 0.0f)
{
Color4 lightSpec(gstate_c.lightColor[2][l], 0.0f);
lightSum1 += (lightSpec * *specular * (powf(dot, specCoef_) * (dot * lightScale)));
lightSum1 += (lightSpec * *specular * (powf(dot, specCoef_) * lightScale));
}
}

4
GPU/GLES/VertexShaderGenerator.cpp
View file

@ -301,7 +301,7 @@ void GenerateVertexShader(int prim, char *buffer) {
if (hasColor) {
WRITE(p, " lowp vec3 unlitColor = a_color0.rgb;\n");
} else {
WRITE(p, " lowp vec3 unlitColor = vec3(u_matambientalpha);\n");
WRITE(p, " lowp vec3 unlitColor = u_matambientalpha.rgb;\n");
}
// TODO: Declare variables for dots for shade mapping if needed.
@ -364,7 +364,7 @@ void GenerateVertexShader(int prim, char *buffer) {
WRITE(p, " vec3 halfVec%i = normalize(normalize(toLight%i) + vec3(0.0, 0.0, 1.0));\n", i, i);
WRITE(p, " dot%i = dot(halfVec%i, worldnormal);\n", i, i);
WRITE(p, " if (dot%i > 0.0)\n", i);
WRITE(p, " lightSum1 += u_lightspecular%i * %s * (pow(dot%i, u_matspecular.a) * (dot%i * lightScale%i));\n", i, specular, i, i, i);
WRITE(p, " lightSum1 += u_lightspecular%i * %s * (pow(dot%i, u_matspecular.a) * lightScale%i);\n", i, specular, i, i);
}
WRITE(p, " lightSum0 += vec4((u_lightambient%i + diffuse%i)*lightScale%i, 0.0);\n", i, i, i);
}