Merge pull request #2568 from raven02/patch-4

HW/SW T&L: remove multiple with 2.0
This commit is contained in:
Henrik Rydgård 2013-07-01 07:33:48 -07:00
commit 9b84f05d16
2 changed files with 5 additions and 11 deletions

View File

@ -715,12 +715,10 @@ void TransformDrawEngine::SoftwareTransformAndDraw(
memcpy(&transformed[index].x, v, 3 * sizeof(float));
transformed[index].fog = fogCoef;
memcpy(&transformed[index].u, uv, 3 * sizeof(float));
if (gstate_c.flipTexture) {
if (throughmode)
if (gstate_c.flipTexture)
transformed[index].v = 1.0f - transformed[index].v;
else
transformed[index].v = 1.0f - transformed[index].v * 2.0f;
}
for (int i = 0; i < 4; i++) {
transformed[index].color0[i] = c0[i] * 255.0f;
}

View File

@ -552,12 +552,8 @@ void GenerateVertexShader(int prim, char *buffer, bool useHWTransform) {
break;
}
if (flipV) {
if (throughmode)
WRITE(p, " v_texcoord.y = 1.0 - v_texcoord.y;\n");
else
WRITE(p, " v_texcoord.y = 1.0 - v_texcoord.y * 2.0;\n");
}
if (flipV)
WRITE(p, " v_texcoord.y = 1.0 - v_texcoord.y;\n");
}
// Compute fogdepth