Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-30 17:02:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Assume lmode does nothing in throughmode.

Browse Source
This commit is contained in:
Unknown W. Brackets 2015-03-08 18:03:17 -07:00
parent fb071a066d
commit 04eb83002c
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
GPU/Directx9/VertexShaderGeneratorDX9.cpp
View File

@ -133,7 +133,7 @@ void GenerateVertexShaderDX9(int prim, char *buffer, bool useHWTransform) {
char *p = buffer;
const u32 vertType = gstate.vertType;
bool lmode = gstate.isUsingSecondaryColor() && gstate.isLightingEnabled();
bool lmode = gstate.isUsingSecondaryColor() && gstate.isLightingEnabled() && !gstate.isModeThrough();
bool doTexture = gstate.isTextureMapEnabled() && !gstate.isModeClear();
bool doTextureProjection = gstate.getUVGenMode() == GE_TEXMAP_TEXTURE_MATRIX;
bool doShadeMapping = gstate.getUVGenMode() == GE_TEXMAP_ENVIRONMENT_MAP;
@ -256,7 +256,7 @@ void GenerateVertexShaderDX9(int prim, char *buffer, bool useHWTransform) {
WRITE(p, " float4 color0 : COLOR0;\n");
}
// only software transform supplies color1 as vertex data
if (lmode && !throughmode) {
if (lmode) {
WRITE(p, " float4 color1 : COLOR1;\n");
}
WRITE(p, "};\n");
@ -271,7 +271,7 @@ void GenerateVertexShaderDX9(int prim, char *buffer, bool useHWTransform) {
WRITE(p, " float2 v_texcoord: TEXCOORD0;\n");
}
WRITE(p, " float4 v_color0 : COLOR0;\n");
if (lmode && !throughmode)
if (lmode)
WRITE(p, " float3 v_color1 : COLOR1;\n");
if (enableFog) {
@ -296,11 +296,11 @@ void GenerateVertexShaderDX9(int prim, char *buffer, bool useHWTransform) {
}
if (hasColor) {
WRITE(p, " Out.v_color0 = In.color0;\n");
if (lmode && !throughmode)
if (lmode)
WRITE(p, " Out.v_color1 = In.color1.rgb;\n");
} else {
WRITE(p, " Out.v_color0 = In.u_matambientalpha;\n");
if (lmode && !throughmode)
if (lmode)
WRITE(p, " Out.v_color1 = float3(0.0);\n");
}
if (enableFog) {
@ -503,9 +503,9 @@ void GenerateVertexShaderDX9(int prim, char *buffer, bool useHWTransform) {
if (lmode) {
WRITE(p, " Out.v_color0 = clamp(lightSum0, 0.0, 1.0);\n");
// v_color1 only exists when lmode = 1.
if (specularIsZero && !throughmode) {
if (specularIsZero) {
WRITE(p, " Out.v_color1 = float3(0, 0, 0);\n");
} else if (!throughmode) {
} else {
WRITE(p, " Out.v_color1 = clamp(lightSum1, 0.0, 1.0);\n");
}
} else {
@ -522,7 +522,7 @@ void GenerateVertexShaderDX9(int prim, char *buffer, bool useHWTransform) {
} else {
WRITE(p, " Out.v_color0 = u_matambientalpha;\n");
}
if (lmode && !throughmode)
if (lmode)
WRITE(p, " Out.v_color1 = float3(0, 0, 0);\n");
}

16
GPU/GLES/VertexShaderGenerator.cpp
View File

@ -214,7 +214,7 @@ void GenerateVertexShader(int prim, u32 vertType, char *buffer, bool useHWTransf
boneWeightDecl = boneWeightInDecl;
}
bool lmode = gstate.isUsingSecondaryColor() && gstate.isLightingEnabled();
bool lmode = gstate.isUsingSecondaryColor() && gstate.isLightingEnabled() && !gstate.isModeThrough();
bool doTexture = gstate.isTextureMapEnabled() && !gstate.isModeClear();
bool doTextureProjection = gstate.getUVGenMode() == GE_TEXMAP_TEXTURE_MATRIX;
bool doShadeMapping = gstate.getUVGenMode() == GE_TEXMAP_ENVIRONMENT_MAP;
@ -264,7 +264,7 @@ void GenerateVertexShader(int prim, u32 vertType, char *buffer, bool useHWTransf
}
if (hasColor) {
WRITE(p, "%s lowp vec4 color0;\n", attribute);
if (lmode && !useHWTransform && !throughmode) // only software transform supplies color1 as vertex data
if (lmode && !useHWTransform) // only software transform supplies color1 as vertex data
WRITE(p, "%s lowp vec3 color1;\n", attribute);
}
@ -337,7 +337,7 @@ void GenerateVertexShader(int prim, u32 vertType, char *buffer, bool useHWTransf
}
WRITE(p, "%s %s lowp vec4 v_color0;\n", shading, varying);
if (lmode && !throughmode) {
if (lmode) {
WRITE(p, "%s %s lowp vec3 v_color1;\n", shading, varying);
}
if (doTexture) {
@ -370,11 +370,11 @@ void GenerateVertexShader(int prim, u32 vertType, char *buffer, bool useHWTransf
}
if (hasColor) {
WRITE(p, " v_color0 = color0;\n");
if (lmode && !throughmode)
if (lmode)
WRITE(p, " v_color1 = color1;\n");
} else {
WRITE(p, " v_color0 = u_matambientalpha;\n");
if (lmode && !throughmode)
if (lmode)
WRITE(p, " v_color1 = vec3(0.0);\n");
}
if (enableFog) {
@ -584,9 +584,9 @@ void GenerateVertexShader(int prim, u32 vertType, char *buffer, bool useHWTransf
if (lmode) {
WRITE(p, " v_color0 = clamp(lightSum0, 0.0, 1.0);\n");
// v_color1 only exists when lmode = 1.
if (specularIsZero && !throughmode) {
if (specularIsZero) {
WRITE(p, " v_color1 = vec3(0.0);\n");
} else if (!throughmode) {
} else {
WRITE(p, " v_color1 = clamp(lightSum1, 0.0, 1.0);\n");
}
} else {
@ -603,7 +603,7 @@ void GenerateVertexShader(int prim, u32 vertType, char *buffer, bool useHWTransf
} else {
WRITE(p, " v_color0 = u_matambientalpha;\n");
}
if (lmode && !throughmode)
if (lmode)
WRITE(p, " v_color1 = vec3(0.0);\n");
}