R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

RTech: minor cleanup and renaming

Browse Source
This commit is contained in:
Kawe Mazidjatari 2024-01-28 18:37:28 +01:00
parent 2322e3a9be
commit 082a8e4ef7
5 changed files with 46 additions and 39 deletions

2
r5dev/common/callback.cpp

@ -335,7 +335,7 @@ void Pak_ListTypes_f(const CCommand& args)
for (int8_t i = 0; i < PAK_MAX_TYPES; ++i)
{
PakAssetBinding_t* type = &g_pPakGlobals->m_assetBindings[i];
PakAssetBinding_t* type = &g_pPakGlobals->assetBindings[i];
if (!type->description)
continue;

41
r5dev/public/rtech/ipakfile.h

@ -40,13 +40,12 @@
#define PAK_MAX_HANDLES 512
#define PAK_MAX_HANDLES_MASK (PAK_MAX_HANDLES-1)
// base pak directory containing paks sorted in platform specific subdirectories
#define PAK_BASE_PATH "paks\\"
#define PLATFORM_PAK_PATH PAK_BASE_PATH"Win64\\"
// pak override directory; the system will looks for pak files in this directory
// first before falling back to PLATFORM_PAK_PATH
#define PLATFORM_PAK_OVERRIDE_PATH PAK_BASE_PATH"Win64_override\\"
// max amount of async streaming requests that could be made per pak file, if a
// pak file has more patches than this number, and is already trying to stream
// this amount in, all remainder patches would have to wait until one slot
// becomes available again
#define PAK_MAX_ASYNC_STREAMED_LOAD_REQUESTS 8
#define PAK_MAX_ASYNC_STREAMED_LOAD_REQUESTS_MASK (PAK_MAX_ASYNC_STREAMED_LOAD_REQUESTS-1)
// the minimum stream ring buffer size when a pak is loaded who's compressed
// size is below PAK_DECODE_IN_RING_BUFFER_SIZE, the system allocates a
@ -65,6 +64,14 @@
#define PAK_DECODE_OUT_RING_BUFFER_SIZE 0x400000
#define PAK_DECODE_OUT_RING_BUFFER_MASK (PAK_DECODE_OUT_RING_BUFFER_SIZE-1)
// base pak directory containing paks sorted in platform specific subdirectories
#define PAK_BASE_PATH "paks\\"
#define PLATFORM_PAK_PATH PAK_BASE_PATH"Win64\\"
// pak override directory; the system will looks for pak files in this directory
// first before falling back to PLATFORM_PAK_PATH
#define PLATFORM_PAK_OVERRIDE_PATH PAK_BASE_PATH"Win64_override\\"
// the handle that should be returned when a pak failed to load or process
#define INVALID_PAK_HANDLE -1
@ -216,27 +223,27 @@ struct PakAssetShort_t
PakGuid_t guid;
uint32_t unk_8;
uint32_t unk_C;
void* m_head;
void* m_cpu;
void* head;
void* cpu;
};
struct PakGlobals_t
{
PakAssetBinding_t m_assetBindings[PAK_MAX_TYPES]; // [ PIXIE ]: Max possible registered assets on Season 3, 0-2 I did not check yet.
PakAssetShort_t m_assets[PAK_MAX_ASSETS];
PakAssetBinding_t assetBindings[PAK_MAX_TYPES]; // [ PIXIE ]: Max possible registered assets on Season 3, 0-2 I did not check yet.
PakAssetShort_t assets[PAK_MAX_ASSETS];
// end size unknown, but there appears to be stuff below too
};
struct PakPatchFileHeader_t
{
size_t m_sizeDisk;
size_t m_sizeMemory;
size_t compressedSize;
size_t decompressedSize;
};
struct PakPatchDataHeader_t
{
int m_editStreamSize;
int m_pageCount;
int editStreamSize;
int pageCount;
};
struct PakFileHeader_t
@ -451,7 +458,7 @@ struct PakFileStream_t
size_t compressedSize;
size_t decompressedSize;
// NOTE: if this is set, the game sets 'PakMemoryData_t::m_processedPatchedDataSize'
// NOTE: if this is set, the game sets 'PakMemoryData_t::processedPatchedDataSize'
// to 'dataOffset'; else its getting set to 'sizeof(PakFileHeader_t)'.
bool isCompressed;
};
@ -467,7 +474,7 @@ struct PakFileStream_t
bool finishedLoadingPatches;
_BYTE gapBE;
_BYTE byteBF;
Descriptor m_descriptors[8];
Descriptor descriptors[PAK_MAX_ASYNC_STREAMED_LOAD_REQUESTS];
uint8_t* buffer;
_QWORD qword1C8;
_QWORD bytesStreamed;

2
r5dev/rtech/pak/pakalloc.cpp

@ -17,7 +17,7 @@ void Pak_AlignSegmentHeaders(PakFile_t* const pak, PakSegmentDescriptor_t* const
for (uint8_t i = 0; i < PAK_MAX_TYPES; ++i)
{
const PakAssetBinding_t& binding = g_pPakGlobals->m_assetBindings[i];
const PakAssetBinding_t& binding = g_pPakGlobals->assetBindings[i];
if (desc->assetTypeCount[i])
{

38
r5dev/rtech/pak/pakparse.cpp

@ -34,7 +34,7 @@ static bool Pak_ResolveAssetDependency(const PakFile_t* const pak, PakGuid_t cur
return false;
currentIndex &= PAK_MAX_ASSETS_MASK;
currentGuid = g_pPakGlobals->m_assets[currentIndex].guid;
currentGuid = g_pPakGlobals->assets[currentIndex].guid;
if (currentGuid == targetGuid)
return true;
@ -64,7 +64,7 @@ void Pak_ResolveAssetRelations(PakFile_t* const pak, const PakAsset_t* const ass
// get asset index
int currentIndex = targetGuid & PAK_MAX_ASSETS_MASK;
const PakGuid_t currentGuid = g_pPakGlobals->m_assets[currentIndex].guid;
const PakGuid_t currentGuid = g_pPakGlobals->assets[currentIndex].guid;
const int64_t v9 = 2i64 * InterlockedExchangeAdd(v5, 1u);
*reinterpret_cast<PakGuid_t*>(const_cast<uint32_t*>(&v5[2 * v9 + 2])) = targetGuid;
@ -105,7 +105,7 @@ void Pak_ResolveAssetRelations(PakFile_t* const pak, const PakAsset_t* const ass
}
// finally write the pointer to the guid entry
*pCurrentGuid = g_pPakGlobals->m_assets[currentIndex].m_head;
*pCurrentGuid = g_pPakGlobals->assets[currentIndex].head;
}
}
@ -157,7 +157,7 @@ void __fastcall Rebuild_14043E030(PakFile_t* const pak)
pak->memoryData.qword2E0[_numAssets] = (int)sub_14043D3C0(pak, pakAsset);
_InterlockedIncrement16(word_167ED7BDE);
v13 = assetBind;
if (g_pPakGlobals->m_assetBindings[(unsigned __int64)assetBind].loadAssetFunc)
if (g_pPakGlobals->assetBindings[(unsigned __int64)assetBind].loadAssetFunc)
{
qword2D8_low = pak->memoryData.pakId;
qword2D8_high = pak->memoryData.unkJobID;
@ -330,12 +330,12 @@ bool Pak_ProcessPakFile(PakFile_t* const pak)
pakHeader = (PakFileHeader_t*)&fileStream->buffer[v18];
}
v17 = byteBF & 7;
v17 = byteBF & PAK_MAX_ASYNC_STREAMED_LOAD_REQUESTS_MASK;
fileStream->m_descriptors[v17].dataOffset = v16 + sizeof(PakFileHeader_t);
fileStream->m_descriptors[v17].compressedSize = v16 + pakHeader->compressedSize;
fileStream->m_descriptors[v17].decompressedSize = pakHeader->decompressedSize;
fileStream->m_descriptors[v17].isCompressed = pakHeader->IsCompressed();
fileStream->descriptors[v17].dataOffset = v16 + sizeof(PakFileHeader_t);
fileStream->descriptors[v17].compressedSize = v16 + pakHeader->compressedSize;
fileStream->descriptors[v17].decompressedSize = pakHeader->decompressedSize;
fileStream->descriptors[v17].isCompressed = pakHeader->IsCompressed();
}
goto LABEL_17;
}
@ -348,7 +348,7 @@ LABEL_18:
byte1FD = pak->byte1FD;
do
{
v22 = &fileStream->m_descriptors[byte1F8 & 7];
v22 = &fileStream->descriptors[byte1F8 & PAK_MAX_ASYNC_STREAMED_LOAD_REQUESTS_MASK];
if (byte1FD)
{
@ -575,9 +575,9 @@ LABEL_45:
if (v56 == FS_ASYNC_FILE_INVALID)
Error(eDLL_T::RTECH, EXIT_FAILURE, "Couldn't open file \"%s\".\n", pakPatchPath);
if (numBytesToProcess < pak->memoryData.patchHeaders[patchCount].m_sizeDisk)
if (numBytesToProcess < pak->memoryData.patchHeaders[patchCount].compressedSize)
Error(eDLL_T::RTECH, EXIT_FAILURE, "File \"%s\" appears truncated; read size: %zu < expected size: %zu.\n",
pakPatchPath, numBytesToProcess, pak->memoryData.patchHeaders[patchCount].m_sizeDisk);
pakPatchPath, numBytesToProcess, pak->memoryData.patchHeaders[patchCount].compressedSize);
FS_CloseAsyncFile((short)fileStream->fileHandle);
@ -586,7 +586,7 @@ LABEL_45:
v58 = (unsigned __int64)((v43 + 7) & 0xFFFFFFF8) << 19;
fileStream->qword0 = v58;
fileStream->byteBC = (v43 == ((v43 + 7) & 0xFFFFFFF8)) + 1;
fileStream->qword8 = v58 + pak->memoryData.patchHeaders[patchCount].m_sizeDisk;
fileStream->qword8 = v58 + pak->memoryData.patchHeaders[patchCount].compressedSize;
LABEL_84:
if (v43 == v44)
return memoryData->patchSrcSize == 0;
@ -595,7 +595,7 @@ LABEL_45:
fileStream->gap14[v47] = -2;
fileStream->gap94[v47] = 1;
if ((((_BYTE)v47 + 1) & 7) == 0)
if ((((_BYTE)v47 + 1) & PAK_MAX_ASYNC_STREAMED_LOAD_REQUESTS_MASK) == 0)
fileStream->byteBC = 2;
LABEL_65:
@ -645,7 +645,7 @@ bool SetupNextPageForPatching(PakLoadedInfo_t* a1, PakFile_t* pak)
int assetTypeIdx = pakAsset->HashTableIndexForAssetType();
pak->memoryData.patchDstPtr = reinterpret_cast<char*>(a1->segmentBuffers[0]) + pak->memoryData.unkAssetTypeBindingSizes[assetTypeIdx];
pak->memoryData.unkAssetTypeBindingSizes[assetTypeIdx] += g_pPakGlobals->m_assetBindings[assetTypeIdx].nativeClassSize;
pak->memoryData.unkAssetTypeBindingSizes[assetTypeIdx] += g_pPakGlobals->assetBindings[assetTypeIdx].nativeClassSize;
return true;
}
@ -748,7 +748,7 @@ bool Pak_ProcessAssets(PakLoadedInfo_t* const a1)
pak->memoryData.patchDstPtr = reinterpret_cast<char*>(a1->segmentBuffers[0]) + pak->memoryData.unkAssetTypeBindingSizes[assetTypeIdx];
pak->memoryData.unkAssetTypeBindingSizes[assetTypeIdx] += g_pPakGlobals->m_assetBindings[assetTypeIdx].nativeClassSize;
pak->memoryData.unkAssetTypeBindingSizes[assetTypeIdx] += g_pPakGlobals->assetBindings[assetTypeIdx].nativeClassSize;
}
else
{
@ -776,7 +776,7 @@ bool Pak_ProcessAssets(PakLoadedInfo_t* const a1)
Pak_ResolveAssetRelations(pak, pAsset);
const int v36 = pak->memoryData.qword2E0[i];
if (dword_167A40B3C[6 * g_pPakGlobals->m_assets[v36].unk_8] == j)
if (dword_167A40B3C[6 * g_pPakGlobals->assets[v36].unk_8] == j)
{
if (*qword_167ED7BC8)
{
@ -827,7 +827,7 @@ void Pak_StubInvalidAssetBinds(PakFile_t* const pak, PakSegmentDescriptor_t* con
const uint8_t assetTypeIndex = asset->HashTableIndexForAssetType();
desc->assetTypeCount[assetTypeIndex]++;
PakAssetBinding_t* const assetBinding = &g_pPakGlobals->m_assetBindings[assetTypeIndex];
PakAssetBinding_t* const assetBinding = &g_pPakGlobals->assetBindings[assetTypeIndex];
if (assetBinding->type == PakAssetBinding_t::NONE)
{
@ -874,7 +874,7 @@ bool Pak_StartLoadingPak(PakLoadedInfo_t* const loadedInfo)
const uint32_t numAssets = pakFile->GetAssetCount();
if (pakFile->memoryData.pakHeader.patchIndex)
pakFile->firstPageIdx = pakFile->memoryData.patchDataHeader->m_pageCount;
pakFile->firstPageIdx = pakFile->memoryData.patchDataHeader->pageCount;
sub_140442740(pakFile->memoryData.ppAssetEntries, &pakFile->memoryData.ppAssetEntries[numAssets], numAssets, pakFile);

2
r5dev/rtech/pak/paktools.cpp

@ -284,7 +284,7 @@ bool Pak_UpdatePatchHeaders(uint8_t* const inBuf, const char* const outPakFile)
__FUNCTION__, patchFile, fileSize);
PakPatchFileHeader_t* const patchHeader = Pak_GetPatchFileHeader(inHeader, i);
patchHeader->m_sizeDisk = fileSize;
patchHeader->compressedSize = fileSize;
}
return true;