GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix performance bug in Development/Release builds due to incorrect draw calls batching (uninitialized memory)

Browse Source
This commit is contained in:
Wojtek Figat
2023-09-28 10:59:09 +02:00
parent b7e871ecfd
commit 98d5769558
7 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Engine/Graphics/Models/Mesh.cpp
View File

@@ -401,10 +401,6 @@ void Mesh::Draw(const RenderContext& renderContext, MaterialBase* material, cons
drawCall.Geometry.VertexBuffers[0] = _vertexBuffers[0]; drawCall.Geometry.VertexBuffers[0] = _vertexBuffers[0];
drawCall.Geometry.VertexBuffers[1] = _vertexBuffers[1]; drawCall.Geometry.VertexBuffers[1] = _vertexBuffers[1];
drawCall.Geometry.VertexBuffers[2] = _vertexBuffers[2]; drawCall.Geometry.VertexBuffers[2] = _vertexBuffers[2];
drawCall.Geometry.VertexBuffersOffsets[0] = 0;
drawCall.Geometry.VertexBuffersOffsets[1] = 0;
drawCall.Geometry.VertexBuffersOffsets[2] = 0;
drawCall.Draw.StartIndex = 0;
drawCall.Draw.IndicesCount = _triangles * 3; drawCall.Draw.IndicesCount = _triangles * 3;
drawCall.InstanceCount = 1; drawCall.InstanceCount = 1;
drawCall.Material = material; drawCall.Material = material;
@@ -459,9 +455,6 @@ void Mesh::Draw(const RenderContext& renderContext, const DrawInfo& info, float
drawCall.Geometry.VertexBuffers[0] = _vertexBuffers[0]; drawCall.Geometry.VertexBuffers[0] = _vertexBuffers[0];
drawCall.Geometry.VertexBuffers[1] = _vertexBuffers[1]; drawCall.Geometry.VertexBuffers[1] = _vertexBuffers[1];
drawCall.Geometry.VertexBuffers[2] = _vertexBuffers[2]; drawCall.Geometry.VertexBuffers[2] = _vertexBuffers[2];
drawCall.Geometry.VertexBuffersOffsets[0] = 0;
drawCall.Geometry.VertexBuffersOffsets[1] = 0;
drawCall.Geometry.VertexBuffersOffsets[2] = 0;
if (info.Deformation) if (info.Deformation)
{ {
info.Deformation->RunDeformers(this, MeshBufferType::Vertex0, drawCall.Geometry.VertexBuffers[0]); info.Deformation->RunDeformers(this, MeshBufferType::Vertex0, drawCall.Geometry.VertexBuffers[0]);
@@ -476,7 +469,6 @@ void Mesh::Draw(const RenderContext& renderContext, const DrawInfo& info, float
drawCall.Geometry.VertexBuffers[2] = info.VertexColors[_lodIndex]; drawCall.Geometry.VertexBuffers[2] = info.VertexColors[_lodIndex];
drawCall.Geometry.VertexBuffersOffsets[2] = vertexOffset * sizeof(VB2ElementType); drawCall.Geometry.VertexBuffersOffsets[2] = vertexOffset * sizeof(VB2ElementType);
} }
drawCall.Draw.StartIndex = 0;
drawCall.Draw.IndicesCount = _triangles * 3; drawCall.Draw.IndicesCount = _triangles * 3;
drawCall.InstanceCount = 1; drawCall.InstanceCount = 1;
drawCall.Material = material; drawCall.Material = material;
@@ -525,9 +517,6 @@ void Mesh::Draw(const RenderContextBatch& renderContextBatch, const DrawInfo& in
drawCall.Geometry.VertexBuffers[0] = _vertexBuffers[0]; drawCall.Geometry.VertexBuffers[0] = _vertexBuffers[0];
drawCall.Geometry.VertexBuffers[1] = _vertexBuffers[1]; drawCall.Geometry.VertexBuffers[1] = _vertexBuffers[1];
drawCall.Geometry.VertexBuffers[2] = _vertexBuffers[2]; drawCall.Geometry.VertexBuffers[2] = _vertexBuffers[2];
drawCall.Geometry.VertexBuffersOffsets[0] = 0;
drawCall.Geometry.VertexBuffersOffsets[1] = 0;
drawCall.Geometry.VertexBuffersOffsets[2] = 0;
if (info.Deformation) if (info.Deformation)
{ {
info.Deformation->RunDeformers(this, MeshBufferType::Vertex0, drawCall.Geometry.VertexBuffers[0]); info.Deformation->RunDeformers(this, MeshBufferType::Vertex0, drawCall.Geometry.VertexBuffers[0]);
@@ -542,7 +531,6 @@ void Mesh::Draw(const RenderContextBatch& renderContextBatch, const DrawInfo& in
drawCall.Geometry.VertexBuffers[2] = info.VertexColors[_lodIndex]; drawCall.Geometry.VertexBuffers[2] = info.VertexColors[_lodIndex];
drawCall.Geometry.VertexBuffersOffsets[2] = vertexOffset * sizeof(VB2ElementType); drawCall.Geometry.VertexBuffersOffsets[2] = vertexOffset * sizeof(VB2ElementType);
} }
drawCall.Draw.StartIndex = 0;
drawCall.Draw.IndicesCount = _triangles * 3; drawCall.Draw.IndicesCount = _triangles * 3;
drawCall.InstanceCount = 1; drawCall.InstanceCount = 1;
drawCall.Material = material; drawCall.Material = material;

11
Source/Engine/Graphics/Models/SkinnedMesh.cpp
View File

@@ -175,11 +175,6 @@ void SkinnedMesh::Draw(const RenderContext& renderContext, const DrawInfo& info,
DrawCall drawCall; DrawCall drawCall;
drawCall.Geometry.IndexBuffer = _indexBuffer; drawCall.Geometry.IndexBuffer = _indexBuffer;
drawCall.Geometry.VertexBuffers[0] = _vertexBuffer; drawCall.Geometry.VertexBuffers[0] = _vertexBuffer;
drawCall.Geometry.VertexBuffers[1] = nullptr;
drawCall.Geometry.VertexBuffers[2] = nullptr;
drawCall.Geometry.VertexBuffersOffsets[0] = 0;
drawCall.Geometry.VertexBuffersOffsets[1] = 0;
drawCall.Geometry.VertexBuffersOffsets[2] = 0;
if (info.Deformation) if (info.Deformation)
info.Deformation->RunDeformers(this, MeshBufferType::Vertex0, drawCall.Geometry.VertexBuffers[0]); info.Deformation->RunDeformers(this, MeshBufferType::Vertex0, drawCall.Geometry.VertexBuffers[0]);
drawCall.Draw.StartIndex = 0; drawCall.Draw.StartIndex = 0;
@@ -224,14 +219,8 @@ void SkinnedMesh::Draw(const RenderContextBatch& renderContextBatch, const DrawI
DrawCall drawCall; DrawCall drawCall;
drawCall.Geometry.IndexBuffer = _indexBuffer; drawCall.Geometry.IndexBuffer = _indexBuffer;
drawCall.Geometry.VertexBuffers[0] = _vertexBuffer; drawCall.Geometry.VertexBuffers[0] = _vertexBuffer;
drawCall.Geometry.VertexBuffers[1] = nullptr;
drawCall.Geometry.VertexBuffers[2] = nullptr;
drawCall.Geometry.VertexBuffersOffsets[0] = 0;
drawCall.Geometry.VertexBuffersOffsets[1] = 0;
drawCall.Geometry.VertexBuffersOffsets[2] = 0;
if (info.Deformation) if (info.Deformation)
info.Deformation->RunDeformers(this, MeshBufferType::Vertex0, drawCall.Geometry.VertexBuffers[0]); info.Deformation->RunDeformers(this, MeshBufferType::Vertex0, drawCall.Geometry.VertexBuffers[0]);
drawCall.Draw.StartIndex = 0;
drawCall.Draw.IndicesCount = _triangles * 3; drawCall.Draw.IndicesCount = _triangles * 3;
drawCall.InstanceCount = 1; drawCall.InstanceCount = 1;
drawCall.Material = material; drawCall.Material = material;

1
Source/Engine/Level/Actors/Skybox.cpp
View File

@@ -97,7 +97,6 @@ void Skybox::ApplySky(GPUContext* context, RenderContext& renderContext, const M
{ {
// Prepare mock draw call data // Prepare mock draw call data
DrawCall drawCall; DrawCall drawCall;
Platform::MemoryClear(&drawCall, sizeof(DrawCall));
drawCall.World = world; drawCall.World = world;
drawCall.ObjectPosition = drawCall.World.GetTranslation(); drawCall.ObjectPosition = drawCall.World.GetTranslation();
drawCall.ObjectRadius = _sphere.Radius; drawCall.ObjectRadius = _sphere.Radius;

5
Source/Engine/Renderer/DrawCall.h
View File

@@ -279,10 +279,11 @@ struct DrawCall
uint64 SortKey; uint64 SortKey;
/// <summary> /// <summary>
/// Does nothing. /// Zero-init.
/// </summary> /// </summary>
DrawCall() FORCE_INLINE DrawCall()
{ {
Platform::MemoryClear(this, sizeof(DrawCall));
} }
}; };

1
Source/Engine/Renderer/Editor/QuadOverdrawPass.cpp
View File

@@ -49,7 +49,6 @@ void QuadOverdrawPass::Render(RenderContext& renderContext, GPUContext* context,
context->BindUA(1, overdrawTexture->View()); context->BindUA(1, overdrawTexture->View());
context->BindUA(2, liveCountTexture->View()); context->BindUA(2, liveCountTexture->View());
DrawCall drawCall; DrawCall drawCall;
Platform::MemoryClear(&drawCall, sizeof(DrawCall));
drawCall.PerInstanceRandom = 1.0f; drawCall.PerInstanceRandom = 1.0f;
MaterialBase::BindParameters bindParams(context, renderContext, drawCall); MaterialBase::BindParameters bindParams(context, renderContext, drawCall);
bindParams.BindViewData(); bindParams.BindViewData();

8
Source/Engine/Renderer/RenderList.cpp
View File

@@ -13,6 +13,7 @@
#include "Engine/Graphics/PostProcessEffect.h" #include "Engine/Graphics/PostProcessEffect.h"
#include "Engine/Profiler/Profiler.h" #include "Engine/Profiler/Profiler.h"
#include "Engine/Content/Assets/CubeTexture.h" #include "Engine/Content/Assets/CubeTexture.h"
#include "Engine/Core/Log.h"
#include "Engine/Level/Scene/Lightmap.h" #include "Engine/Level/Scene/Lightmap.h"
#include "Engine/Level/Actors/PostFxVolume.h" #include "Engine/Level/Actors/PostFxVolume.h"
@@ -434,11 +435,11 @@ FORCE_INLINE void CalculateSortKey(const RenderContext& renderContext, DrawCall&
const float distance = Float3::Dot(planeNormal, drawCall.ObjectPosition) - planePoint; const float distance = Float3::Dot(planeNormal, drawCall.ObjectPosition) - planePoint;
PackedSortKey key; PackedSortKey key;
key.DistanceKey = RenderTools::ComputeDistanceSortKey(distance); key.DistanceKey = RenderTools::ComputeDistanceSortKey(distance);
uint32 batchKey = GetHash(drawCall.Geometry.IndexBuffer); uint32 batchKey = GetHash(drawCall.Material);
batchKey = (batchKey * 397) ^ GetHash(drawCall.Geometry.VertexBuffers[0]); batchKey = (batchKey * 397) ^ GetHash(drawCall.Geometry.VertexBuffers[0]);
batchKey = (batchKey * 397) ^ GetHash(drawCall.Geometry.VertexBuffers[1]); batchKey = (batchKey * 397) ^ GetHash(drawCall.Geometry.VertexBuffers[1]);
batchKey = (batchKey * 397) ^ GetHash(drawCall.Geometry.VertexBuffers[2]); batchKey = (batchKey * 397) ^ GetHash(drawCall.Geometry.VertexBuffers[2]);
batchKey = (batchKey * 397) ^ GetHash(drawCall.Material); batchKey = (batchKey * 397) ^ GetHash(drawCall.Geometry.IndexBuffer);
IMaterial::InstancingHandler handler; IMaterial::InstancingHandler handler;
if (drawCall.Material->CanUseInstancing(handler)) if (drawCall.Material->CanUseInstancing(handler))
handler.GetHash(drawCall, batchKey); handler.GetHash(drawCall, batchKey);
@@ -557,7 +558,7 @@ namespace
a.InstanceCount != 0 && a.InstanceCount != 0 &&
b.InstanceCount != 0 && b.InstanceCount != 0 &&
handler.CanBatch(a, b) && handler.CanBatch(a, b) &&
a.WorldDeterminantSign == b.WorldDeterminantSign; a.WorldDeterminantSign * b.WorldDeterminantSign > 0;
} }
} }
@@ -618,7 +619,6 @@ void RenderList::SortDrawCalls(const RenderContext& renderContext, bool reverseD
const DrawCall& other = drawCallsData[listData[j]]; const DrawCall& other = drawCallsData[listData[j]];
if (!CanBatchWith(drawCall, other)) if (!CanBatchWith(drawCall, other))
break; break;
batchSize++; batchSize++;
instanceCount += other.InstanceCount; instanceCount += other.InstanceCount;
} }

3
Source/Engine/UI/TextRender.cpp
View File

@@ -379,9 +379,6 @@ void TextRender::Draw(RenderContext& renderContext)
drawCall.Geometry.VertexBuffers[0] = _vb0.GetBuffer(); drawCall.Geometry.VertexBuffers[0] = _vb0.GetBuffer();
drawCall.Geometry.VertexBuffers[1] = _vb1.GetBuffer(); drawCall.Geometry.VertexBuffers[1] = _vb1.GetBuffer();
drawCall.Geometry.VertexBuffers[2] = _vb2.GetBuffer(); drawCall.Geometry.VertexBuffers[2] = _vb2.GetBuffer();
drawCall.Geometry.VertexBuffersOffsets[0] = 0;
drawCall.Geometry.VertexBuffersOffsets[1] = 0;
drawCall.Geometry.VertexBuffersOffsets[2] = 0;
drawCall.InstanceCount = 1; drawCall.InstanceCount = 1;
// Submit draw calls // Submit draw calls