birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/CryEngine/CrySystem/StreamEngine/StreamAsyncFileRequest.cpp
+12 -6
View File
@@ -512,7 +512,8 @@ uint32 CAsyncIOFileRequest::ReadFile(CStreamingIOThread* pIOThread)
}
CCryFile file;
if ((nError = OpenFile(file)))
nError = OpenFile(file);
if (nError)
{
return nError;
}
@@ -555,12 +556,14 @@ uint32 CAsyncIOFileRequest::ReadFile(CStreamingIOThread* pIOThread)
}
auto pZipEntry = ((AZ::IO::Archive*)(gEnv->pCryPak))->GetOpenedFileDataInZip(file.GetHandle());
if ((nError = ConfigureRead(pZipEntry.get())))
nError = ConfigureRead(pZipEntry.get());
if (nError)
{
return nError;
}
if ((nError = AllocateOutput(pZipEntry.get())))
nError = AllocateOutput(pZipEntry.get());
if (nError)
{
return nError;
}
@@ -578,14 +581,16 @@ uint32 CAsyncIOFileRequest::ReadFileResume(CStreamingIOThread* pIOThread)
}
CCryFile file;
if ((nError = OpenFile(file)))
nError = OpenFile(file);
if (nError)
{
return nError;
}
auto pZipEntry = ((AZ::IO::Archive*)(gEnv->pCryPak))->GetOpenedFileDataInZip(file.GetHandle());
if ((nError = AllocateOutput(pZipEntry.get())))
nError = AllocateOutput(pZipEntry.get());
if (nError)
{
return nError;
}
@@ -653,7 +658,8 @@ uint32 CAsyncIOFileRequest::ReadFileInPages(CStreamingIOThread* pIOThread, CCryF
}
//check if job needs to be pre-empted
if ((nError = ReadFileCheckPreempt(pIOThread)))
nError = ReadFileCheckPreempt(pIOThread);
if (nError)
{
return nError;
}