VideoCommon/TextureInfo: Fix mipmap loading from tmem #9826
Conversation
| @@ -86,6 +86,7 @@ TextureInfo::TextureInfo(const u8* ptr, const u8* tlut_ptr, u32 address, | |||
|
|
|||
| // load mips - TODO: Loading mipmaps from tmem is untested! | |||
| const u8* src_data = m_ptr + GetTextureSize(); | |||
| tmem_even += m_texture_size; | |||
There was a problem hiding this comment.
We should only do this if tmem_even is not a nullptr, otherwise, it seems like this has UB?
There was a problem hiding this comment.
Probably a good idea as a matter of principle, though it doesn't technically matter since we don't dereference in that case.
|
| @@ -86,6 +86,8 @@ TextureInfo::TextureInfo(const u8* ptr, const u8* tlut_ptr, u32 address, | |||
|
|
|||
| // load mips - TODO: Loading mipmaps from tmem is untested! | |||
There was a problem hiding this comment.
Shouldn't this comment be modified?
There was a problem hiding this comment.
I dunno, I didn't put it there. Unsure whether it's still relevant.
There was a problem hiding this comment.
I guess this counts as testing it, since the fact this fixes the issue proves that the game is loading mipmaps from tmem (and that we're doing so correctly, bug notwithstanding).
There was a problem hiding this comment.
Yeah, this was an old comment from the previous code, no idea why it was there. I just left it in when I ported it over.
Even address needs to be offset to the first mipmap entry.
Even address needs to be offset to the first mipmap entry.
Fixes https://bugs.dolphin-emu.org/issues/12556