ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
kd-11 2016-02-11 14:51:03 +03:00
parent 9671a654b7
commit 7d70be42af
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/RSX/RSXTexture.cpp
View File

@ -202,12 +202,12 @@ namespace rsx
u16 texture::depth() const 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 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) void vertex_texture::init(u8 index)
@ -386,11 +386,11 @@ namespace rsx
u16 vertex_texture::depth() const 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 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;
} }
} }