From 79110638c974b2dee5f0150e221561fa5a5acff5 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sat, 6 Jul 2013 22:49:58 +0200 Subject: [PATCH] Unbreak things (silly mistake in last commit, remove *2.0 factor which just can't be right) --- GPU/GLES/FragmentShaderGenerator.cpp | 6 +++++- GPU/GLES/TransformPipeline.cpp | 2 +- GPU/GLES/VertexShaderGenerator.cpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/GPU/GLES/FragmentShaderGenerator.cpp b/GPU/GLES/FragmentShaderGenerator.cpp index 23986d7b63..62ad370890 100644 --- a/GPU/GLES/FragmentShaderGenerator.cpp +++ b/GPU/GLES/FragmentShaderGenerator.cpp @@ -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()) diff --git a/GPU/GLES/TransformPipeline.cpp b/GPU/GLES/TransformPipeline.cpp index d6e2b40907..1ba41a13a9 100644 --- a/GPU/GLES/TransformPipeline.cpp +++ b/GPU/GLES/TransformPipeline.cpp @@ -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; diff --git a/GPU/GLES/VertexShaderGenerator.cpp b/GPU/GLES/VertexShaderGenerator.cpp index 2ccf958c7d..c7001b8809 100644 --- a/GPU/GLES/VertexShaderGenerator.cpp +++ b/GPU/GLES/VertexShaderGenerator.cpp @@ -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