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

merging latest development

Browse Source 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
This commit is contained in:
kberg-amzn
2021-09-20 13:53:30 -07:00
parent 011bd5d10e b9d1af9f46
commit ff1482bb03
7 changed files with 87 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzFramework/AzFramework/Archive/ZipDirCache.cpp
+1 -1
View File
@@ -774,7 +774,7 @@ namespace AZ::IO::ZipDir
return ZD_ERROR_INVALID_CALL;
}
if (pFileEntry->nFileDataOffset != pFileEntry->INVALID_DATA_OFFSET)
if (pFileEntry->nFileDataOffset != FileEntryBase::INVALID_DATA_OFFSET)
{
return ZD_ERROR_SUCCESS; // the data offset has been successfully read..
}
Code/Framework/AzFramework/AzFramework/Archive/ZipDirCacheFactory.cpp
+2 -3
View File
@@ -553,7 +553,7 @@ namespace AZ::IO::ZipDir
//////////////////////////////////////////////////////////////////////////
// give the CDR File Header entry, reads the local file header to validate
// and determine where the actual file lies
// and determine where the actual file resides
void CacheFactory::AddFileEntry(char* strFilePath, const ZipFile::CDRFileHeader* pFileHeader, const SExtraZipFileData& extra)
{
if (pFileHeader->lLocalHeaderOffset > m_CDREnd.lCDROffset)
@@ -600,8 +600,7 @@ namespace AZ::IO::ZipDir
if (m_encryptedHeaders != ZipFile::HEADERS_NOT_ENCRYPTED)
{
// use CDR instead of local header
// The pak encryption tool asserts that there is no extra data at the end of the local file header, so don't add any extra data from the CDR header.
fileEntry.nFileDataOffset = pFileHeader->lLocalHeaderOffset + sizeof(ZipFile::LocalFileHeader) + pFileHeader->nFileNameLength;
fileEntry.nFileDataOffset = pFileHeader->lLocalHeaderOffset + sizeof(ZipFile::LocalFileHeader) + pFileHeader->nFileNameLength + pFileHeader->nExtraFieldLength;
}
else
{
Code/Framework/AzFramework/AzFramework/Archive/ZipDirStructures.cpp
+12 -16
View File
@@ -187,8 +187,7 @@ namespace AZ::IO::ZipDir::ZipDirStructuresInternal
// If src/dst overlap (in place decompress), then inflate in chunks, copying src locally to ensure
// pointers don't foul each other.
bool bIndependantBlocks = ((pInput + nInputLen) <= pOutput) || (pInput >= (pOutput + nOutputLen));
if (bIndependantBlocks)
if ((pInput + nInputLen) <= pOutput || pInput >= (pOutput + nOutputLen))
{
pZStream->next_in = (Bytef*)pInput;
pZStream->avail_in = aznumeric_cast<uint32_t>(nInputLen);
@@ -260,8 +259,7 @@ namespace AZ::IO::ZipDir::ZipDirStructuresInternal
// If src/dst overlap (in place decompress), then inflate in chunks, copying src locally to ensure
// pointers don't foul each other.
bool bIndependantBlocks = ((pIn + nIn) <= stream.next_out) || (pIn >= (stream.next_out + stream.avail_out));
if (bIndependantBlocks)
if ((pIn + nIn) <= stream.next_out || pIn >= (stream.next_out + stream.avail_out))
{
stream.next_in = pIn;
stream.avail_in = nIn;
@@ -498,18 +496,18 @@ namespace AZ::IO::ZipDir
//////////////////////////////////////////////////////////////////////////
FileEntryBase::FileEntryBase(const ZipFile::CDRFileHeader& header, const SExtraZipFileData& extra)
{
this->desc = header.desc;
this->nFileHeaderOffset = header.lLocalHeaderOffset;
//this->nFileDataOffset = INVALID_DATA_OFFSET; // we don't know yet
this->nMethod = header.nMethod;
this->nNameOffset = 0; // we don't know yet
this->nLastModTime = header.nLastModTime;
this->nLastModDate = header.nLastModDate;
this->nNTFS_LastModifyTime = extra.nLastModifyTime;
desc = header.desc;
nFileHeaderOffset = header.lLocalHeaderOffset;
nMethod = header.nMethod;
nNameOffset = 0; // we don't know yet
nLastModTime = header.nLastModTime;
nLastModDate = header.nLastModDate;
nNTFS_LastModifyTime = extra.nLastModifyTime;
// make an estimation (at least this offset should be there), but we don't actually know yet
this->nFileDataOffset = header.lLocalHeaderOffset + sizeof(ZipFile::LocalFileHeader) + header.nFileNameLength;
this->nEOFOffset = header.lLocalHeaderOffset + sizeof(ZipFile::LocalFileHeader) + header.nFileNameLength + header.desc.lSizeCompressed;
nFileDataOffset = header.lLocalHeaderOffset + sizeof(ZipFile::LocalFileHeader) + header.nFileNameLength + header.nExtraFieldLength;
nEOFOffset = nFileDataOffset + header.desc.lSizeCompressed;
}
// Uncompresses raw (without wrapping) data that is compressed with method 8 (deflated) in the Zip file
@@ -817,8 +815,6 @@ namespace AZ::IO::ZipDir
header.nFileNameLength = aznumeric_cast<uint16_t>(nFileNameLength);
header.nExtraFieldLength = 0;
pFileEntry->nFileDataOffset = pFileEntry->nFileHeaderOffset + sizeof(header) + header.nFileNameLength;
pFileEntry->nEOFOffset = pFileEntry->nFileDataOffset + pFileEntry->desc.lSizeCompressed;
if (!AZ::IO::FileIOBase::GetDirectInstance()->Write(fileHandle, &header, sizeof(header)))
{
return ZD_ERROR_IO_FAILED;
Code/Framework/AzFramework/AzFramework/Archive/ZipDirStructures.h
+1 -1
View File
@@ -169,7 +169,7 @@ namespace AZ::IO::ZipDir
inline static constexpr uint32_t INVALID_DATA_OFFSET = 0xFFFFFFFF;
ZipFile::DataDescriptor desc{};
uint32_t nFileDataOffset{}; // offset of the packed info inside the file; NOTE: this can be INVALID_DATA_OFFSET, if not calculated yet!
uint32_t nFileDataOffset{ INVALID_DATA_OFFSET }; // offset of the packed info inside the file; NOTE: this can be INVALID_DATA_OFFSET, if not calculated yet!
uint32_t nFileHeaderOffset{ INVALID_DATA_OFFSET }; // offset of the local file header
uint32_t nNameOffset{}; // offset of the file name in the name pool for the directory
Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
+1 -1
View File
@@ -951,7 +951,7 @@ namespace AZ
subMeshes.push_back(subMesh);
}
rayTracingFeatureProcessor->SetMesh(m_objectId, subMeshes);
rayTracingFeatureProcessor->SetMesh(m_objectId, m_model->GetModelAsset()->GetId(), subMeshes);
}
void MeshDataInstance::SetSortKey(RHI::DrawItemSortKey sortKey)
Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
+53 -7
View File
@@ -79,7 +79,7 @@ namespace AZ
AZ_Assert(m_rayTracingMaterialSrg, "Failed to create RayTracingMaterialSrg");
}
void RayTracingFeatureProcessor::SetMesh(const ObjectId objectId, const SubMeshVector& subMeshes)
void RayTracingFeatureProcessor::SetMesh(const ObjectId objectId, const AZ::Data::AssetId& assetId, const SubMeshVector& subMeshes)
{
if (!m_rayTracingEnabled)
{
@@ -89,10 +89,13 @@ namespace AZ
RHI::Ptr<RHI::Device> device = RHI::RHISystemInterface::Get()->GetDevice();
uint32_t objectIndex = objectId.GetIndex();
// lock the mutex to protect the mesh and BLAS lists
AZStd::unique_lock<AZStd::mutex> lock(m_mutex);
MeshMap::iterator itMesh = m_meshes.find(objectIndex);
if (itMesh == m_meshes.end())
{
m_meshes.insert(AZStd::make_pair(objectIndex, Mesh{ subMeshes }));
m_meshes.insert(AZStd::make_pair(objectIndex, Mesh{ assetId, subMeshes }));
}
else
{
@@ -102,9 +105,12 @@ namespace AZ
m_meshes[objectIndex].m_subMeshes = subMeshes;
}
// create the BLAS buffers for each sub-mesh
// create the BLAS buffers for each sub-mesh, or re-use existing BLAS objects if they were already created.
// Note: all sub-meshes must either create new BLAS objects or re-use existing ones, otherwise it's an error (it's the same model in both cases)
// Note: the buffer is just reserved here, the BLAS is built in the RayTracingAccelerationStructurePass
Mesh& mesh = m_meshes[objectIndex];
bool blasInstanceFound = false;
for (auto& subMesh : mesh.m_subMeshes)
{
RHI::RayTracingBlasDescriptor blasDescriptor;
@@ -115,11 +121,37 @@ namespace AZ
->IndexBuffer(subMesh.m_indexBufferView)
;
// create the BLAS object
subMesh.m_blas = AZ::RHI::RayTracingBlas::CreateRHIRayTracingBlas();
// search for an existing BLAS object for this model
RayTracingBlasMap::iterator itBlas = m_blasMap.find(assetId);
if (itBlas != m_blasMap.end())
{
// re-use existing BLAS
subMesh.m_blas = itBlas->second.m_blas;
itBlas->second.m_count++;
// create the buffers from the descriptor
subMesh.m_blas->CreateBuffers(*device, &blasDescriptor, *m_bufferPools);
// keep track of the fact that we re-used a BLAS
blasInstanceFound = true;
}
else
{
AZ_Assert(blasInstanceFound == false, "Partial set of RayTracingBlas objects found for mesh");
// create the BLAS object
subMesh.m_blas = AZ::RHI::RayTracingBlas::CreateRHIRayTracingBlas();
// create the buffers from the descriptor
subMesh.m_blas->CreateBuffers(*device, &blasDescriptor, *m_bufferPools);
// store the BLAS in the side list
RayTracingBlasInstance blasInstance = { subMesh.m_blas, 1 };
m_blasMap.insert({ assetId, blasInstance });
}
}
if (blasInstanceFound)
{
// set the mesh BLAS flag so we don't try to rebuild it in the RayTracingAccelerationStructurePass
mesh.m_blasBuilt = true;
}
// set initial transform
@@ -140,12 +172,26 @@ namespace AZ
return;
}
// lock the mutex to protect the mesh and BLAS lists
AZStd::unique_lock<AZStd::mutex> lock(m_mutex);
MeshMap::iterator itMesh = m_meshes.find(objectId.GetIndex());
if (itMesh != m_meshes.end())
{
m_subMeshCount -= aznumeric_cast<uint32_t>(itMesh->second.m_subMeshes.size());
m_meshes.erase(itMesh);
m_revision++;
// decrement the count from the BLAS instance, and check to see if we can remove it
RayTracingBlasMap::iterator itBlas = m_blasMap.find(itMesh->second.m_assetId);
if (itBlas != m_blasMap.end())
{
itBlas->second.m_count--;
if (itBlas->second.m_count == 0)
{
m_blasMap.erase(itBlas);
}
}
}
m_meshInfoBufferNeedsUpdate = true;
Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.h
+17 -1
View File
@@ -116,6 +116,9 @@ namespace AZ
//! Contains data for the top level mesh, including the list of sub-meshes
struct Mesh
{
// assetId of the model
AZ::Data::AssetId m_assetId = AZ::Data::AssetId{};
// sub-mesh list
SubMeshVector m_subMeshes;
@@ -134,7 +137,7 @@ namespace AZ
//! Sets ray tracing data for a mesh.
//! This will cause an update to the RayTracing acceleration structure on the next frame
void SetMesh(const ObjectId objectId, const SubMeshVector& subMeshes);
void SetMesh(const ObjectId objectId, const AZ::Data::AssetId& assetId, const SubMeshVector& subMeshes);
//! Removes ray tracing data for a mesh.
//! This will cause an update to the RayTracing acceleration structure on the next frame
@@ -220,6 +223,9 @@ namespace AZ
// cached TransformServiceFeatureProcessor
TransformServiceFeatureProcessor* m_transformServiceFeatureProcessor = nullptr;
// mutex for the mesh and BLAS lists
AZStd::mutex m_mutex;
// structure for data in the m_meshInfoBuffer, shaders that use the buffer must match this type
struct MeshInfo
{
@@ -260,6 +266,16 @@ namespace AZ
// flag indicating we need to update the materialInfo buffer
bool m_materialInfoBufferNeedsUpdate = false;
// side list for looking up existing BLAS objects so they can be re-used when the same mesh is added multiple times
struct RayTracingBlasInstance
{
RHI::Ptr<RHI::RayTracingBlas> m_blas;
uint32_t m_count = 0;
};
using RayTracingBlasMap = AZStd::unordered_map<AZ::Data::AssetId, RayTracingBlasInstance>;
RayTracingBlasMap m_blasMap;
};
}
}