Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Additional cleanup

Browse source
This commit is contained in:
Henrik Rydgård 2022-07-28 12:41:15 +02:00
parent ae6763766e
commit c031f3085b
4 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
GPU/D3D11/TextureCacheD3D11.cpp
View file

@ -644,8 +644,6 @@ void TextureCacheD3D11::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &
int w = gstate.getTextureWidth(srcLevel); int w = gstate.getTextureWidth(srcLevel);
int h = gstate.getTextureHeight(srcLevel); int h = gstate.getTextureHeight(srcLevel);
ID3D11Texture2D *texture = DxTex(&entry);
gpuStats.numTexturesDecoded++; gpuStats.numTexturesDecoded++;
// For UpdateSubresource, we can't decode directly into the texture so we allocate a buffer :( // For UpdateSubresource, we can't decode directly into the texture so we allocate a buffer :(
u32 *mapData = nullptr; u32 *mapData = nullptr;
@ -656,7 +654,6 @@ void TextureCacheD3D11::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &
double replaceStart = time_now_d(); double replaceStart = time_now_d();
replaced.Load(srcLevel, mapData, mapRowPitch); replaced.Load(srcLevel, mapData, mapRowPitch);
replacementTimeThisFrame_ += time_now_d() - replaceStart; replacementTimeThisFrame_ += time_now_d() - replaceStart;
dstFmt = ToDXGIFormat(replaced.Format(srcLevel));
} else { } else {
GETextureFormat tfmt = (GETextureFormat)entry.format; GETextureFormat tfmt = (GETextureFormat)entry.format;
GEPaletteFormat clutformat = gstate.getClutPaletteFormat(); GEPaletteFormat clutformat = gstate.getClutPaletteFormat();
@ -725,6 +722,7 @@ void TextureCacheD3D11::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &
} }
} }
ID3D11Texture2D *texture = DxTex(&entry);
context_->UpdateSubresource(texture, dstLevel, nullptr, mapData, mapRowPitch, 0); context_->UpdateSubresource(texture, dstLevel, nullptr, mapData, mapRowPitch, 0);
FreeAlignedMemory(mapData); FreeAlignedMemory(mapData);
} }

1
GPU/Directx9/TextureCacheDX9.cpp
View file

@ -598,7 +598,6 @@ void TextureCacheDX9::LoadTextureLevel(TexCacheEntry &entry, uint8_t *data, int
double replaceStart = time_now_d(); double replaceStart = time_now_d();
replaced.Load(level, data, stride); replaced.Load(level, data, stride);
replacementTimeThisFrame_ += time_now_d() - replaceStart; replacementTimeThisFrame_ += time_now_d() - replaceStart;
dstFmt = ToD3D9Format(replaced.Format(level));
} else { } else {
GETextureFormat tfmt = (GETextureFormat)entry.format; GETextureFormat tfmt = (GETextureFormat)entry.format;
GEPaletteFormat clutformat = gstate.getClutPaletteFormat(); GEPaletteFormat clutformat = gstate.getClutPaletteFormat();

6
GPU/GLES/TextureCacheGLES.cpp
View file

@ -635,9 +635,8 @@ void TextureCacheGLES::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &r
gpuStats.numTexturesDecoded++; gpuStats.numTexturesDecoded++;
if (replaced.GetSize(srcLevel, w, h)) { if (replaced.GetSize(srcLevel, w, h)) {
PROFILE_THIS_SCOPE("replacetex");
int bpp = (int)DataFormatSizeInBytes(replaced.Format(srcLevel)); int bpp = (int)DataFormatSizeInBytes(replaced.Format(srcLevel));
decPitch = w * bpp; decPitch = w * bpp;
uint8_t *rearrange = (uint8_t *)AllocateAlignedMemory(decPitch * h, 16); uint8_t *rearrange = (uint8_t *)AllocateAlignedMemory(decPitch * h, 16);
double replaceStart = time_now_d(); double replaceStart = time_now_d();
@ -647,8 +646,6 @@ void TextureCacheGLES::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &r
dstFmt = replaced.Format(srcLevel); dstFmt = replaced.Format(srcLevel);
} else { } else {
PROFILE_THIS_SCOPE("decodetex");
GEPaletteFormat clutformat = gstate.getClutPaletteFormat(); GEPaletteFormat clutformat = gstate.getClutPaletteFormat();
u32 texaddr = gstate.getTextureAddress(srcLevel); u32 texaddr = gstate.getTextureAddress(srcLevel);
int bufw = GetTextureBufw(srcLevel, texaddr, GETextureFormat(entry.format)); int bufw = GetTextureBufw(srcLevel, texaddr, GETextureFormat(entry.format));
@ -686,7 +683,6 @@ void TextureCacheGLES::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &r
} }
} }
PROFILE_THIS_SCOPE("loadtex");
render_->TextureImage(entry.textureName, dstLevel, w, h, dstFmt, pixelData, GLRAllocType::ALIGNED); render_->TextureImage(entry.textureName, dstLevel, w, h, dstFmt, pixelData, GLRAllocType::ALIGNED);
} }

1
GPU/Vulkan/TextureCacheVulkan.cpp
View file

@ -1014,7 +1014,6 @@ void TextureCacheVulkan::LoadTextureLevel(TexCacheEntry &entry, uint8_t *writePt
uint8_t *rearrange = (uint8_t *)AllocateAlignedMemory(w * scaleFactor * h * scaleFactor * 4, 16); uint8_t *rearrange = (uint8_t *)AllocateAlignedMemory(w * scaleFactor * h * scaleFactor * 4, 16);
scaler.ScaleAlways((u32 *)rearrange, pixelData, fmt, w, h, scaleFactor); scaler.ScaleAlways((u32 *)rearrange, pixelData, fmt, w, h, scaleFactor);
pixelData = (u32 *)writePtr; pixelData = (u32 *)writePtr;
dstFmt = (VkFormat)fmt;
// We always end up at 8888. Other parts assume this. // We always end up at 8888. Other parts assume this.
_assert_(dstFmt == VULKAN_8888_FORMAT); _assert_(dstFmt == VULKAN_8888_FORMAT);