From 482d470bf22f063bfb533410d5a4d2402ba58b91 Mon Sep 17 00:00:00 2001 From: DHrpcs3 <dh.rpcs3@gmail.com> Date: Sun, 18 Jan 2015 12:51:30 +0200 Subject: [PATCH] Small RSX fixes - Fixed constants offset in FP decompiler. - Fixed vertex textures initialization. --- rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp | 2 +- rpcs3/Emu/RSX/GL/GLGSRender.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp index bca4dbc7c0..ff169fcd0f 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp @@ -104,7 +104,7 @@ std::string GLFragmentDecompilerThread::AddConst() auto data = vm::ptr<u32>::make(m_addr + m_size + m_offset); - m_offset += 4 * 4; + m_offset = 2 * 4 * sizeof(u32); u32 x = GetData(data[0]); u32 y = GetData(data[1]); u32 z = GetData(data[2]); diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index b6827f143e..d3208be762 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -1978,7 +1978,7 @@ void GLGSRender::ExecCMD() m_gl_vertex_textures[i].Create(); m_gl_vertex_textures[i].Bind(); checkForGlError(fmt::Format("m_gl_vertex_textures[%d].Bind", i)); - m_program.SetTex(i); + m_program.SetVTex(i); m_gl_vertex_textures[i].Init(m_vertex_textures[i]); checkForGlError(fmt::Format("m_gl_vertex_textures[%d].Init", i)); }