archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 06:21:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: initialize vertex textures on reset

Browse source
This commit is contained in:
DHrpcs3 2016-01-06 01:25:17 +02:00
parent 3ac9e0933f
commit 8912b9880e
3 changed files with 7 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

23
rpcs3/Emu/RSX/RSXTexture.cpp
View file

@ -279,24 +279,6 @@ namespace rsx
return ((method_registers[NV4097_SET_VERTEX_TEXTURE_FORMAT + (m_index * 8)] >> 16) & 0xffff); return ((method_registers[NV4097_SET_VERTEX_TEXTURE_FORMAT + (m_index * 8)] >> 16) & 0xffff);
} }
u8 vertex_texture::wrap_s() const
{
return 1;
//return ((method_registers[NV4097_SET_VERTEX_TEXTURE_ADDRESS + (m_index * 8)]) & 0xf);
}
u8 vertex_texture::wrap_t() const
{
return 1;
//return ((method_registers[NV4097_SET_VERTEX_TEXTURE_ADDRESS + (m_index * 8)] >> 8) & 0xf);
}
u8 vertex_texture::wrap_r() const
{
return 1;
//return ((method_registers[NV4097_SET_VERTEX_TEXTURE_ADDRESS + (m_index * 8)] >> 16) & 0xf);
}
u8 vertex_texture::unsigned_remap() const u8 vertex_texture::unsigned_remap() const
{ {
return ((method_registers[NV4097_SET_VERTEX_TEXTURE_ADDRESS + (m_index * 8)] >> 12) & 0xf); return ((method_registers[NV4097_SET_VERTEX_TEXTURE_ADDRESS + (m_index * 8)] >> 12) & 0xf);
@ -347,11 +329,6 @@ namespace rsx
return ((method_registers[NV4097_SET_VERTEX_TEXTURE_CONTROL0 + (m_index * 8)] >> 2) & 0x1); return ((method_registers[NV4097_SET_VERTEX_TEXTURE_CONTROL0 + (m_index * 8)] >> 2) & 0x1);
} }
u32 vertex_texture::remap() const
{
return 0 | (1 << 2) | (2 << 4) | (3 << 6);//(method_registers[NV4097_SET_VERTEX_TEXTURE_CONTROL1 + (m_index * 8)]);
}
u16 vertex_texture::bias() const u16 vertex_texture::bias() const
{ {
return ((method_registers[NV4097_SET_VERTEX_TEXTURE_FILTER + (m_index * 8)]) & 0x1fff); return ((method_registers[NV4097_SET_VERTEX_TEXTURE_FILTER + (m_index * 8)]) & 0x1fff);

6
rpcs3/Emu/RSX/RSXTexture.h
View file

@ -86,9 +86,6 @@ namespace rsx
u16 mipmap() const; u16 mipmap() const;
// Address // Address
u8 wrap_s() const;
u8 wrap_t() const;
u8 wrap_r() const;
u8 unsigned_remap() const; u8 unsigned_remap() const;
u8 zfunc() const; u8 zfunc() const;
u8 gamma() const; u8 gamma() const;
@ -102,9 +99,6 @@ namespace rsx
u8 max_aniso() const; u8 max_aniso() const;
bool alpha_kill_enabled() const; bool alpha_kill_enabled() const;
// Control1
u32 remap() const;
// Filter // Filter
u16 bias() const; u16 bias() const;
u8 min_filter() const; u8 min_filter() const;

7
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -624,13 +624,20 @@ namespace rsx
// Reset vertex attrib array // Reset vertex attrib array
for (int i = 0; i < limits::vertex_count; i++) for (int i = 0; i < limits::vertex_count; i++)
{
vertex_arrays_info[i].size = 0; vertex_arrays_info[i].size = 0;
}
// Construct Textures // Construct Textures
for (int i = 0; i < limits::textures_count; i++) for (int i = 0; i < limits::textures_count; i++)
{ {
textures[i].init(i); textures[i].init(i);
} }
for (int i = 0; i < limits::vertex_textures_count; i++)
{
vertex_textures[i].init(i);
}
} }
void thread::init(const u32 ioAddress, const u32 ioSize, const u32 ctrlAddress, const u32 localAddress) void thread::init(const u32 ioAddress, const u32 ioSize, const u32 ctrlAddress, const u32 localAddress)