preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-11 07:03:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Vulkan: Reorganize a bit so we can decode directly.

Browse Source
This commit is contained in:
Unknown W. Brackets
2016-03-26 15:02:07 -07:00
parent e7ea1da99f
commit 29287ea0ee
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPU/Vulkan/TextureCacheVulkan.cpp
+20 -9
View File
@@ -1463,7 +1463,7 @@ VkFormat TextureCacheVulkan::GetDestFormat(GETextureFormat format, GEPaletteForm
}
}
void *TextureCacheVulkan::DecodeTextureLevel(GETextureFormat format, GEPaletteFormat clutformat, uint32_t texaddr, int level, VkFormat dstFmt, int scaleFactor, int bufw) {
void *TextureCacheVulkan::DecodeTextureLevel(u8 *out, int outPitch, GETextureFormat format, GEPaletteFormat clutformat, uint32_t texaddr, int level, VkFormat dstFmt, int scaleFactor, int bufw) {
void *finalBuf = NULL;
bool swizzled = gstate.isTextureSwizzled();
@@ -1690,12 +1690,24 @@ void TextureCacheVulkan::LoadTextureLevel(TexCacheEntry &entry, uint8_t *writePt
GEPaletteFormat clutformat = gstate.getClutPaletteFormat();
u32 texaddr = gstate.getTextureAddress(level);
int bufw = GetTextureBufw(level, texaddr, tfmt);
void *finalBuf = DecodeTextureLevel(tfmt, clutformat, texaddr, level, dstFmt, scaleFactor, bufw);
int bpp = dstFmt == VULKAN_8888_FORMAT ? 4 : 2;
pixelData = (u32 *)writePtr;
decPitch = rowPitch;
if (scaleFactor > 1) {
tmpTexBufRearrange.resize(std::max(bufw, w) * h);
pixelData = tmpTexBufRearrange.data();
decPitch = bufw * bpp;
}
void *finalBuf = DecodeTextureLevel((u8 *)pixelData, decPitch, tfmt, clutformat, texaddr, level, dstFmt, scaleFactor, bufw);
if (finalBuf == NULL) {
return;
}
decPitch = bufw * (dstFmt == VULKAN_8888_FORMAT ? 4 : 2);
rowBytes = w * (dstFmt == VULKAN_8888_FORMAT ? 4 : 2);
if (finalBuf != pixelData) {
decPitch = bufw * bpp;
}
rowBytes = w * bpp;
gpuStats.numTexturesDecoded++;
pixelData = (u32 *)finalBuf;
@@ -1721,11 +1733,10 @@ void TextureCacheVulkan::LoadTextureLevel(TexCacheEntry &entry, uint8_t *writePt
}
PROFILE_THIS_SCOPE("loadtex");
// TODO: Get rid of this, and decode or scale directly into this.
for (int y = 0; y < h; y++) {
memcpy(writePtr + rowPitch * y, (const uint8_t *)pixelData + decPitch * y, rowBytes);
// uncomment to make all textures white for debugging
//memset(writePtr + rowPitch * y, 0xff, rowBytes);
if (pixelData != (u32 *)writePtr) {
for (int y = 0; y < h; y++) {
memcpy(writePtr + rowPitch * y, (const uint8_t *)pixelData + decPitch * y, rowBytes);
}
}
/*