archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-14 18:58:29 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Logging: Add TextureReadback logtype and clean up code

Browse source
This commit is contained in:
Exzap 2023-01-27 06:32:50 +01:00
parent 9bbfd33842
commit 387b712959
10 changed files with 112 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Cafe/HW/Latte/Core/LatteCommandProcessor.cpp
View file

@ -224,7 +224,6 @@ void LatteCP_itIndirectBufferDepr(uint32 nWords)
uint32 physicalAddressHigh = readU32(); // unused
uint32 sizeInDWords = readU32();
uint32 displayListSize = sizeInDWords * 4;
cemu_assert_debug(displayListSize >= 4);
DrawPassContext drawPassCtx;
LatteCP_processCommandBuffer(memory_getPointerFromPhysicalOffset(physicalAddress), displayListSize, drawPassCtx);
if (drawPassCtx.isWithinDrawPass())

2
src/Cafe/HW/Latte/Core/LatteTextureLoader.cpp
View file

@ -746,6 +746,8 @@ void LatteTextureLoader_writeReadbackTextureToMemory(LatteTextureDefinition* tex
return;
}
cemuLog_log(LogType::TextureReadback, "[WriteReadbackTex] PhysAddr {:08x} Res {}x{} Fmt {} Slice {} Mip {}", textureData->physAddress, textureData->width, textureData->height, textureData->format, sliceIndex, mipIndex);
if (textureData->tileMode == Latte::E_HWTILEMODE::TM_LINEAR_ALIGNED)
{
uint32 pitch = textureLoader.width;

4
src/Cafe/IOSU/fsa/iosu_fsa.cpp
View file

@ -283,7 +283,7 @@ namespace iosu
return -0x400;
}
*fileHandle = fsFileHandle;
cemuLog_log(LogType::File, "Open file {} (access: {} result: ok handle: 0x{})", path, accessModifierStr, (uint32)*fileHandle);
cemuLog_log(LogType::CoreinitFile, "Open file {} (access: {} result: ok handle: 0x{})", path, accessModifierStr, (uint32)*fileHandle);
return (FSStatus)FS_RESULT::SUCCESS;
}
@ -307,7 +307,7 @@ namespace iosu
return -0x400;
}
*dirHandle = fsDirHandle;
cemuLog_log(LogType::File, "Open directory {} (result: ok handle: 0x{})", path, (uint32)*dirHandle);
cemuLog_log(LogType::CoreinitFile, "Open directory {} (result: ok handle: 0x{})", path, (uint32)*dirHandle);
return (FSStatus)FS_RESULT::SUCCESS;
}

128
src/Cafe/OS/libs/coreinit/coreinit_FS.cpp
View file

@ -1564,96 +1564,96 @@ namespace coreinit
void InitializeFS()
{
cafeExportRegister("coreinit", FSInit, LogType::File);
cafeExportRegister("coreinit", FSShutdown, LogType::File);
cafeExportRegister("coreinit", FSInit, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSShutdown, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetMountSource, LogType::File);
cafeExportRegister("coreinit", FSGetMountSourceNext, LogType::File);
cafeExportRegister("coreinit", FSGetMountSource, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetMountSourceNext, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSMount, LogType::File);
cafeExportRegister("coreinit", FSBindMount, LogType::File);
cafeExportRegister("coreinit", FSMount, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSBindMount, LogType::CoreinitFile);
// client management
cafeExportRegister("coreinit", FSAddClientEx, LogType::File);
cafeExportRegister("coreinit", FSAddClient, LogType::File);
cafeExportRegister("coreinit", FSDelClient, LogType::File);
cafeExportRegister("coreinit", FSGetClientNum, LogType::File);
cafeExportRegister("coreinit", FSAddClientEx, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSAddClient, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSDelClient, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetClientNum, LogType::CoreinitFile);
// cmd
cafeExportRegister("coreinit", FSInitCmdBlock, LogType::File);
cafeExportRegister("coreinit", FSGetAsyncResult, LogType::File);
cafeExportRegister("coreinit", FSInitCmdBlock, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetAsyncResult, LogType::CoreinitFile);
// file operations
cafeExportRegister("coreinit", FSOpenFileAsync, LogType::File);
cafeExportRegister("coreinit", FSOpenFile, LogType::File);
cafeExportRegister("coreinit", FSOpenFileExAsync, LogType::File);
cafeExportRegister("coreinit", FSOpenFileEx, LogType::File);
cafeExportRegister("coreinit", FSCloseFileAsync, LogType::File);
cafeExportRegister("coreinit", FSCloseFile, LogType::File);
cafeExportRegister("coreinit", FSOpenFileAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSOpenFile, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSOpenFileExAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSOpenFileEx, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSCloseFileAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSCloseFile, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSReadFileAsync, LogType::File);
cafeExportRegister("coreinit", FSReadFile, LogType::File);
cafeExportRegister("coreinit", FSReadFileWithPosAsync, LogType::File);
cafeExportRegister("coreinit", FSReadFileWithPos, LogType::File);
cafeExportRegister("coreinit", FSReadFileAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSReadFile, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSReadFileWithPosAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSReadFileWithPos, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSWriteFileAsync, LogType::File);
cafeExportRegister("coreinit", FSWriteFile, LogType::File);
cafeExportRegister("coreinit", FSWriteFileWithPosAsync, LogType::File);
cafeExportRegister("coreinit", FSWriteFileWithPos, LogType::File);
cafeExportRegister("coreinit", FSWriteFileAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSWriteFile, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSWriteFileWithPosAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSWriteFileWithPos, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSSetPosFileAsync, LogType::File);
cafeExportRegister("coreinit", FSSetPosFile, LogType::File);
cafeExportRegister("coreinit", FSGetPosFileAsync, LogType::File);
cafeExportRegister("coreinit", FSGetPosFile, LogType::File);
cafeExportRegister("coreinit", FSSetPosFileAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSSetPosFile, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetPosFileAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetPosFile, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSAppendFileAsync, LogType::File);
cafeExportRegister("coreinit", FSAppendFile, LogType::File);
cafeExportRegister("coreinit", FSAppendFileAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSAppendFile, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSTruncateFileAsync, LogType::File);
cafeExportRegister("coreinit", FSTruncateFile, LogType::File);
cafeExportRegister("coreinit", FSTruncateFileAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSTruncateFile, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSRenameAsync, LogType::File);
cafeExportRegister("coreinit", FSRename, LogType::File);
cafeExportRegister("coreinit", FSRemoveAsync, LogType::File);
cafeExportRegister("coreinit", FSRemove, LogType::File);
cafeExportRegister("coreinit", FSMakeDirAsync, LogType::File);
cafeExportRegister("coreinit", FSMakeDir, LogType::File);
cafeExportRegister("coreinit", FSChangeDirAsync, LogType::File);
cafeExportRegister("coreinit", FSChangeDir, LogType::File);
cafeExportRegister("coreinit", FSGetCwdAsync, LogType::File);
cafeExportRegister("coreinit", FSGetCwd, LogType::File);
cafeExportRegister("coreinit", FSRenameAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSRename, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSRemoveAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSRemove, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSMakeDirAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSMakeDir, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSChangeDirAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSChangeDir, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetCwdAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetCwd, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSIsEofAsync, LogType::File);
cafeExportRegister("coreinit", FSIsEof, LogType::File);
cafeExportRegister("coreinit", FSIsEofAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSIsEof, LogType::CoreinitFile);
// directory operations
cafeExportRegister("coreinit", FSOpenDirAsync, LogType::File);
cafeExportRegister("coreinit", FSOpenDir, LogType::File);
cafeExportRegister("coreinit", FSReadDirAsync, LogType::File);
cafeExportRegister("coreinit", FSReadDir, LogType::File);
cafeExportRegister("coreinit", FSCloseDirAsync, LogType::File);
cafeExportRegister("coreinit", FSCloseDir, LogType::File);
cafeExportRegister("coreinit", FSOpenDirAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSOpenDir, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSReadDirAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSReadDir, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSCloseDirAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSCloseDir, LogType::CoreinitFile);
// stat
cafeExportRegister("coreinit", FSGetFreeSpaceSizeAsync, LogType::File);
cafeExportRegister("coreinit", FSGetFreeSpaceSize, LogType::File);
cafeExportRegister("coreinit", FSGetFreeSpaceSizeAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetFreeSpaceSize, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetStatAsync, LogType::File);
cafeExportRegister("coreinit", FSGetStat, LogType::File);
cafeExportRegister("coreinit", FSGetStatAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetStat, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetStatFileAsync, LogType::File);
cafeExportRegister("coreinit", FSGetStatFile, LogType::File);
cafeExportRegister("coreinit", FSGetStatFileAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetStatFile, LogType::CoreinitFile);
// misc
cafeExportRegister("coreinit", FSFlushQuotaAsync, LogType::File);
cafeExportRegister("coreinit", FSFlushQuota, LogType::File);
cafeExportRegister("coreinit", FSFlushQuotaAsync, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSFlushQuota, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSSetUserData, LogType::File);
cafeExportRegister("coreinit", FSGetUserData, LogType::File);
cafeExportRegister("coreinit", FSSetUserData, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetUserData, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetCurrentCmdBlock, LogType::File);
cafeExportRegister("coreinit", FSGetCurrentCmdBlock, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetVolumeState, LogType::File);
cafeExportRegister("coreinit", FSGetVolumeState, LogType::CoreinitFile);
cafeExportRegister("coreinit", FSGetErrorCodeForViewer, LogType::Placeholder);
cafeExportRegister("coreinit", FSGetLastErrorCodeForViewer, LogType::Placeholder);

4
src/Cafe/OS/libs/padscore/padscore.cpp
View file

@ -748,8 +748,8 @@ namespace padscore
void load()
{
cafeExportRegister("padscore", WPADIsMplsAttached, LogType::Input);
cafeExportRegister("padscore", WPADGetAccGravityUnit, LogType::Input);
cafeExportRegister("padscore", WPADIsMplsAttached, LogType::InputAPI);
cafeExportRegister("padscore", WPADGetAccGravityUnit, LogType::InputAPI);
// wpad
//osLib_addFunction("padscore", "WPADInit", padscore::export_WPADInit);

6
src/Cafe/OS/libs/vpad/vpad.cpp
View file

@ -1159,9 +1159,9 @@ namespace vpad
void load()
{
cafeExportRegister("vpad", VPADSetBtnRepeat, LogType::Input);
cafeExportRegister("vpad", VPADSetSamplingCallback, LogType::Input);
cafeExportRegister("vpad", VPADRead, LogType::Input);
cafeExportRegister("vpad", VPADSetBtnRepeat, LogType::InputAPI);
cafeExportRegister("vpad", VPADSetSamplingCallback, LogType::InputAPI);
cafeExportRegister("vpad", VPADRead, LogType::InputAPI);
osLib_addFunction("vpad", "VPADGetAccParam", vpadExport_VPADGetAccParam);
osLib_addFunction("vpad", "VPADSetAccParam", vpadExport_VPADSetAccParam);