preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-26 19:58:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #7361 from hrydgard/color-conv-centralize"

Browse Source 
This reverts commit f1b57dabf5, reversing
changes made to 41001637ce.
This commit is contained in:
Henrik Rydgard committed 2015-01-22 19:53:32 +01:00
1 parent 07933cad42
commit cae58cafee
33 files changed
+1195 -476
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

GPU/Directx9/TextureCacheDX9.cpp
+2 -19
View File
@@ -1703,25 +1703,8 @@ void TextureCacheDX9::LoadTextureLevel(TexCacheEntry &entry, int level, int maxL
gpuStats.numTexturesDecoded++;
u32 *pixelData = (u32 *)finalBuf;
if (scaleFactor > 1 && (entry.status & TexCacheEntry::STATUS_CHANGE_FREQUENT) == 0) {
GEBufferFormat dstFormat;
switch (dstFmt) {
case D3DFMT_A8R8G8B8: dstFormat = GE_FORMAT_8888; break;
case D3DFMT_R5G6B5: dstFormat = GE_FORMAT_565; break;
case D3DFMT_A4R4G4B4: dstFormat = GE_FORMAT_4444; break;
case D3DFMT_A1R5G5B5: dstFormat = GE_FORMAT_5551; break;
default: goto dontScale;
}
scaler.Scale(pixelData, dstFormat, w, h, scaleFactor);
switch (dstFormat) {
case GE_FORMAT_8888: dstFmt = D3DFMT_A8R8G8B8; break;
case GE_FORMAT_565: dstFmt = D3DFMT_R5G6B5; break;
case GE_FORMAT_4444: dstFmt = D3DFMT_A4R4G4B4; break;
case GE_FORMAT_5551: dstFmt = D3DFMT_A1R5G5B5; break;
}
dontScale:
;
}
if (scaleFactor > 1 && (entry.status & TexCacheEntry::STATUS_CHANGE_FREQUENT) == 0)
scaler.Scale(pixelData, dstFmt, w, h, scaleFactor);
if ((entry.status & TexCacheEntry::STATUS_CHANGE_FREQUENT) == 0) {
TexCacheEntry::Status alphaStatus = CheckAlpha(pixelData, dstFmt, w, w, h);