From 7d70be42af0fcbcb7e6bfb458e7e028c10aef341 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Thu, 11 Feb 2016 14:51:03 +0300 Subject: [PATCH] Correctly fetch correct pitch and depth for textures from RSX Include vertex textures too Set correct stride for vertex texture params Change references to gl_Position in D3D12FragmentProgramDecompiler Revert bad commit --- rpcs3/Emu/RSX/RSXTexture.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/RSX/RSXTexture.cpp b/rpcs3/Emu/RSX/RSXTexture.cpp index 9ad938f6d6..dd4bfba429 100644 --- a/rpcs3/Emu/RSX/RSXTexture.cpp +++ b/rpcs3/Emu/RSX/RSXTexture.cpp @@ -202,12 +202,12 @@ namespace rsx u16 texture::depth() const { - return method_registers[NV4097_SET_TEXTURE_CONTROL3] >> 20; + return method_registers[NV4097_SET_TEXTURE_CONTROL3 + m_index] >> 20; } u32 texture::pitch() const { - return method_registers[NV4097_SET_TEXTURE_CONTROL3] & 0xfffff; + return method_registers[NV4097_SET_TEXTURE_CONTROL3 + m_index] & 0xfffff; } void vertex_texture::init(u8 index) @@ -386,11 +386,11 @@ namespace rsx u16 vertex_texture::depth() const { - return method_registers[NV4097_SET_VERTEX_TEXTURE_CONTROL3] >> 20; + return method_registers[NV4097_SET_VERTEX_TEXTURE_CONTROL3 + (m_index * 8)] >> 20; } u32 vertex_texture::pitch() const { - return method_registers[NV4097_SET_VERTEX_TEXTURE_CONTROL3] & 0xfffff; + return method_registers[NV4097_SET_VERTEX_TEXTURE_CONTROL3 + (m_index * 8)] & 0xfffff; } } \ No newline at end of file