From 2d8632cd7a97b3bcaf7617b049e4d84e12ef9255 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Thu, 30 May 2013 13:07:15 +0200 Subject: [PATCH] Remove texture coordinate difference between HW and SW transform. Partly fixes #1963 --- GPU/GLES/ShaderManager.cpp | 6 ++++-- GPU/GLES/TransformPipeline.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/GPU/GLES/ShaderManager.cpp b/GPU/GLES/ShaderManager.cpp index 51bb5e6130..bb92b9b624 100644 --- a/GPU/GLES/ShaderManager.cpp +++ b/GPU/GLES/ShaderManager.cpp @@ -313,8 +313,10 @@ void LinkedShader::updateUniforms() { uvscaleoff[2] /= gstate_c.curTextureWidth; uvscaleoff[3] /= gstate_c.curTextureHeight; } else { - uvscaleoff[0] *= 2.0f; - uvscaleoff[1] *= 2.0f; + static const float rescale[4] = {0, 2*127.5f/128.f, 2*32767.5f/32768.f, 2.0f}; + float factor = rescale[(gstate.vertType & GE_VTYPE_TC_MASK) >> GE_VTYPE_TC_SHIFT]; + uvscaleoff[0] *= factor; + uvscaleoff[1] *= factor; } glUniform4fv(u_uvscaleoffset, 1, uvscaleoff); } diff --git a/GPU/GLES/TransformPipeline.cpp b/GPU/GLES/TransformPipeline.cpp index bd18bb3593..6688b70484 100644 --- a/GPU/GLES/TransformPipeline.cpp +++ b/GPU/GLES/TransformPipeline.cpp @@ -1111,7 +1111,7 @@ void TransformDrawEngine::Flush() { LinkedShader *program = shaderManager_->ApplyShader(prim); - if (CanUseHardwareTransform(prevPrim_)) { + if (CanUseHardwareTransform(prim)) { GLuint vbo = 0, ebo = 0; int vertexCount = 0; bool useElements = true;