Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stereoscopy regression fixes #7716

Merged
merged 4 commits into from Feb 3, 2019

Conversation

3 participants
@stenzek
Copy link
Contributor

commented Jan 19, 2019

Currently, stereoscopy is broken, at least when partial XFB copies or the OpenGL backend is used.

I'm surprised nobody has reported this, I'm guessing it must not have many users, as it's been broken for some time..

The last commit addresses a possible crash if a partial texture update includes a paletted texture. Not sure how likely that is, but the iterator's going to be invalid.

@stenzek stenzek force-pushed the stenzek:stereo branch from 260f7d0 to 1070192 Jan 19, 2019


u32 numBlocksX = entry_to_update->native_width / tex_info.block_width;
// XFBs created for the purpose of being a container for textures from memory

This comment has been minimized.

Copy link
@iwubcode

iwubcode Jan 19, 2019

Contributor

Probably best to remove or rework this comment, it doesn't really make sense in this context

while (iter.first != iter.second)
{
TCacheEntry* entry = iter.first->second;
if (entry != entry_to_update && entry->IsCopy() && !entry->tmem_only &&
entry->references.count(entry_to_update) == 0 &&

This comment has been minimized.

Copy link
@iwubcode

iwubcode Jan 19, 2019

Contributor

Was this intentionally removed? I haven't been following the code base, maybe this is to match the other function?

This comment has been minimized.

Copy link
@stenzek

stenzek Jan 20, 2019

Author Contributor

With entry_to_update always being a new texture, the existing textures shouldn't have any references to it.

@iwubcode
Copy link
Contributor

left a comment

Couple of minor comments, otherwise it looks good

@Tilka Tilka merged commit 8aaebfa into dolphin-emu:master Feb 3, 2019

10 checks passed

default Very basic checks passed, handed off to Buildbot.
Details
lint Build succeeded on builder lint
Details
pr-android Build succeeded on builder pr-android
Details
pr-deb-dbg-x64 Build succeeded on builder pr-deb-dbg-x64
Details
pr-deb-x64 Build succeeded on builder pr-deb-x64
Details
pr-freebsd-x64 Build succeeded on builder pr-freebsd-x64
Details
pr-osx-x64 Build succeeded on builder pr-osx-x64
Details
pr-ubu-x64 Build succeeded on builder pr-ubu-x64
Details
pr-win-dbg-x64 Build succeeded on builder pr-win-dbg-x64
Details
pr-win-x64 Build succeeded on builder pr-win-x64
Details

@stenzek stenzek deleted the stenzek:stereo branch Feb 11, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.