From 1538fd050d96dd4de7e037234328f784498901fb Mon Sep 17 00:00:00 2001 From: hrydgard Date: Tue, 21 Oct 2008 21:45:13 +0000 Subject: [PATCH] Revert bad bugfix :p wasn't a bug at all git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@931 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp index 98e0828fda..f36a732f3e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp @@ -318,9 +318,11 @@ void PixelShaderMngr::SetConstants(FRAGMENTSHADER& ps) int texcoord = bpmem.tevindref.getTexCoord(i); TCoordInfo& tc = bpmem.texcoords[texcoord]; - f[2*i] = bpmem.texscale[i/2].getScaleS(i&1) * (float)(tc.s.scale_minus_1+1) / (float)(lastTexDims[srctexmap] & 0xffff); - f[2*i+1] = bpmem.texscale[i/2].getScaleT(i&1) * (float)(tc.t.scale_minus_1+1) / (float)((lastTexDims[srctexmap] >> 16) & 0xffff); - + f[2*i] = bpmem.texscale[i/2].getScaleS(i&1) * + (float)(tc.s.scale_minus_1+1) / (float)(lastTexDims[srctexmap] & 0xffff); + f[2*i+1] = bpmem.texscale[i/2].getScaleT(i&1) * + (float)(tc.t.scale_minus_1+1) / (float)((lastTexDims[srctexmap] >> 16) & 0xfff); + // Yes, the above should really be 0xfff. The top 4 bits are used for other stuff. PRIM_LOG("tex indscale%d: %f %f\n", i, f[2*i], f[2*i+1]); }