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

TextureCacheBase: fix custom textures not being loaded #5206

Merged
merged 1 commit into from Apr 5, 2017

Conversation

ligfx
Copy link
Contributor

@ligfx ligfx commented Apr 4, 2017

Fixes bug #10183 introduced by 3bd184a / PR #4467.

TextureCacheBase was no longer calling entry->Load for custom textures after the new compute shader decoding logic was added. This adds it back in. It also slightly restructures the decoding if-group to match the one below, which I think makes the logic more obvious.

(recommend viewing with git diff -b to ignore the indentation changes)

Fixes bug dolphin-emu#10183 [0] introduced by 3bd184a / PR dolphin-emu#4467 [1].

TextureCacheBase was no longer calling `entry->Load` for custom textures
since the compute shader decoding logic was added. This adds it back in.
It also slightly restructures the decoding if-group to match the one
below, which I think makes the logic more obvious.

(recommend viewing with `git diff -b` to ignore the indentation changes)

[0]: https://bugs.dolphin-emu.org/issues/10183
[1]: dolphin-emu#4467
@ligfx ligfx changed the title TextureCacheBase: fix loading custom textures TextureCacheBase: fix custom textures not being loaded Apr 4, 2017
@stenzek
Copy link
Contributor

stenzek commented Apr 5, 2017

LGTM

@stenzek stenzek merged commit 27e9e46 into dolphin-emu:master Apr 5, 2017
@ligfx ligfx deleted the fixcustomtextures branch May 24, 2017 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants