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.

Sign up for GitHub

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

Jump to bottom

DXT5: Fix decoding of alpha channel for textures with a non-mod-4 width. #18554

Merged
merged 2 commits into from
Dec 15, 2023
Merged

DXT5: Fix decoding of alpha channel for textures with a non-mod-4 width. #18554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e47bab
Enable ForceLowerResolutionForEffects for another Tiger game
hrydgard Dec 15, 2023
acbc9dc
DXT5: Fix decoding of alpha channel for textures with a non-mod-4 width.
hrydgard Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions GPU/Common/TextureDecoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,10 +566,11 @@ void DXTDecoder::WriteColorsDXT3(u32 *dst, const DXT3Block *src, int pitch, int

void DXTDecoder::WriteColorsDXT5(u32 *dst, const DXT5Block *src, int pitch, int width, int height) {
// 48 bits, 3 bit index per pixel, 12 bits per line.
u64 alphadata = ((u64)(u16)src->alphadata1 << 32) | (u32)src->alphadata2;
u64 allAlpha = ((u64)(u16)src->alphadata1 << 32) | (u32)src->alphadata2;

for (int y = 0; y < height; y++) {
int colordata = src->color.lines[y];
uint32_t colordata = src->color.lines[y];
uint32_t alphadata = allAlpha >> (12 * y);
for (int x = 0; x < width; x++) {
dst[x] = colors_[colordata & 3] | (alpha_[alphadata & 7] << 24);
colordata >>= 2;
Expand Down
7 changes: 7 additions & 0 deletions assets/compat.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,6 +1351,13 @@ UCKS45124 = true
UCJS10104 = true
NPJG00047 = true

# Tiger Woods 06 - bloom during rain
ULUS10028 = true
ULES00153 = true
ULES00154 = true
ULJM05059 = true
ULAS42020 = true

[ForceLowerResolutionForEffectsOff]
# Some games really don't work with this. Ratchet & Clank looks terrible.
UCUS98633 = true
Expand Down