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

Update some comments

Browse Source
This commit is contained in:
moudgils
2021-06-09 18:35:52 -07:00
parent ca475fab80
commit a55edd518a
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp
+2 -1
View File
@@ -386,8 +386,9 @@ namespace AZ
void ArgumentBuffer::AddUntrackedResourcesToEncoder(id<MTLCommandEncoder> commandEncoder, const ShaderResourceGroupVisibility& srgResourcesVisInfo) const
{
//Map tp cache all the resoources based on the usage as we can batch all the resources for a given usage
ComputeResourcesToMakeResidentMap resourcesToMakeResidentCompute;
//Map tp cache all the resoources based on the usage and shader stage as we can batch all the resources for a given usage/shader usage
GraphicsResourcesToMakeResidentMap resourcesToMakeResidentGraphics;
//Cache the constant buffer associated with a srg
Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.h
+2
View File
@@ -125,7 +125,9 @@ namespace AZ
AZStd::array<id <MTLResource>, MaxEntriesInArgTable> m_resourceArray;
int m_resourceArrayLen = 0;
};
//Map tp cache all the resoources based on the usage as we can batch all the resources for a given usage
using ComputeResourcesToMakeResidentMap = AZStd::unordered_map<MTLResourceUsage, MetalResourceArray>;
//Map tp cache all the resoources based on the usage and shader stage as we can batch all the resources for a given usage/shader usage
using GraphicsResourcesToMakeResidentMap = AZStd::unordered_map<AZStd::pair<MTLResourceUsage,MTLRenderStages>, MetalResourceArray>;
void CollectResourcesForCompute(id<MTLCommandEncoder> encoder, const ResourceBindingsSet& resourceBindingData, ComputeResourcesToMakeResidentMap& resourcesToMakeResidentMap) const;
Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp
+2 -2
View File
@@ -255,6 +255,7 @@ namespace AZ
uint32_t bufferVertexRegisterIdMax = 0;
uint32_t bufferFragmentOrComputeRegisterIdMax = 0;
//Arrays to cache all the buffers and offsets in order to make batch calls
MetalArgumentBufferArray mtlVertexArgBuffers;
MetalArgumentBufferArrayOffsets mtlVertexArgBufferOffsets;
MetalArgumentBufferArray mtlFragmentOrComputeArgBuffers;
@@ -298,7 +299,6 @@ namespace AZ
mtlVertexArgBufferOffsets[slotIndex] = argBufferOffset;
bufferVertexRegisterIdMin = AZStd::min(slotIndex, bufferVertexRegisterIdMin);
bufferVertexRegisterIdMax = AZStd::max(slotIndex, bufferVertexRegisterIdMax);
}
if( numBitsSet > 1 || srgVisInfo == RHI::ShaderStageMask::Fragment)
@@ -595,7 +595,7 @@ namespace AZ
AZ_Assert(count <= METAL_MAX_ENTRIES_BUFFER_ARG_TABLE , "Slots needed cannot exceed METAL_MAX_ENTRIES_BUFFER_ARG_TABLE");
NSRange range = {METAL_MAX_ENTRIES_BUFFER_ARG_TABLE - count, count};
//For metal the stream buffers are populated from bottom to top as the top slots are taken by argument buffers
//The stream buffers are populated from bottom to top as the top slots are taken by argument buffers
for (int i = count-1; i >= 0; --i)
{
if (streams[i].GetBuffer())