Unbreak things (silly mistake in last commit, remove *2.0 factor which just can't be right)

This commit is contained in:
Henrik Rydgard
2013-07-06 22:50:06 +02:00
parent 9928bd762c
commit 79110638c9
3 changed files with 7 additions and 3 deletions
+5 -1
View File
@@ -172,7 +172,11 @@ void GenerateFragmentShader(char *buffer) {
WRITE(p, "uniform sampler2D tex;\n");
if (enableAlphaTest || enableColorTest) {
WRITE(p, "uniform highp vec4 u_alphacolorref;\n");
#if defined(GLSL_ES_1_0)
WRITE(p, "uniform mediump vec4 u_alphacolorref;\n");
#else
WRITE(p, "uniform vec4 u_alphacolorref;\n");
#endif
WRITE(p, "uniform vec4 u_colormask;\n");
}
if (gstate.isTextureMapEnabled())
+1 -1
View File
@@ -717,7 +717,7 @@ void TransformDrawEngine::SoftwareTransformAndDraw(
memcpy(&transformed[index].u, uv, 3 * sizeof(float));
if (gstate_c.flipTexture)
transformed[index].v = 1.0f - transformed[index].v * 2.0f;
transformed[index].v = 1.0f - transformed[index].v;
for (int i = 0; i < 4; i++) {
transformed[index].color0[i] = c0[i] * 255.0f;
+1 -1
View File
@@ -553,7 +553,7 @@ void GenerateVertexShader(int prim, char *buffer, bool useHWTransform) {
}
if (flipV)
WRITE(p, " v_texcoord.y = 1.0 - v_texcoord.y * 2.0;\n");
WRITE(p, " v_texcoord.y = 1.0 - v_texcoord.y;\n");
}
// Compute fogdepth