Unify the clearing of variables after a draw call

hrydgard · Oct 6, 2023 · 10ccbfd · 10ccbfd
1 parent 64ee567
commit 10ccbfd
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 83 deletions.
diff --git a/GPU/Common/DrawEngineCommon.h b/GPU/Common/DrawEngineCommon.h
@@ -195,6 +195,28 @@ class DrawEngineCommon {
 		}
 	}
 
+	inline void ResetAfterDrawInline() {
+		gpuStats.numFlushes++;
+		gpuStats.numDrawCalls += numDrawInds_;
+		gpuStats.numVertexDecodes += numDrawVerts_;
+		gpuStats.numVertsSubmitted += vertexCountInDrawCalls_;
+
+		indexGen.Reset();
+		decodedVerts_ = 0;
+		numDrawVerts_ = 0;
+		numDrawInds_ = 0;
+		vertexCountInDrawCalls_ = 0;
+		decodeIndsCounter_ = 0;
+		decodeVertsCounter_ = 0;
+		gstate_c.vertexFullAlpha = true;
+
+		// Now seems as good a time as any to reset the min/max coords, which we may examine later.
+		gstate_c.vertBounds.minU = 512;
+		gstate_c.vertBounds.minV = 512;
+		gstate_c.vertBounds.maxU = 0;
+		gstate_c.vertBounds.maxV = 0;
+	}
+
 	uint32_t ComputeDrawcallsHash() const;
 
 	bool useHWTransform_ = false;

diff --git a/GPU/D3D11/DrawEngineD3D11.cpp b/GPU/D3D11/DrawEngineD3D11.cpp
@@ -725,27 +725,8 @@ void DrawEngineD3D11::DoFlush() {
 		decOptions_.applySkinInDecode = g_Config.bSoftwareSkinning;
 	}
 
-	gpuStats.numFlushes++;
-	gpuStats.numDrawCalls += numDrawInds_;
-	gpuStats.numVertexDecodes += numDrawVerts_;
-	gpuStats.numVertsSubmitted += vertexCountInDrawCalls_;
-
-	indexGen.Reset();
-	decodedVerts_ = 0;
-	numDrawVerts_ = 0;
-	numDrawInds_ = 0;
-	vertexCountInDrawCalls_ = 0;
-	decodeVertsCounter_ = 0;
-	decodeIndsCounter_ = 0;
-	gstate_c.vertexFullAlpha = true;
+	ResetAfterDrawInline();
 	framebufferManager_->SetColorUpdated(gstate_c.skipDrawReason);
-
-	// Now seems as good a time as any to reset the min/max coords, which we may examine later.
-	gstate_c.vertBounds.minU = 512;
-	gstate_c.vertBounds.minV = 512;
-	gstate_c.vertBounds.maxU = 0;
-	gstate_c.vertBounds.maxV = 0;
-
 	GPUDebug::NotifyDraw();
 }
 

diff --git a/GPU/Directx9/DrawEngineDX9.cpp b/GPU/Directx9/DrawEngineDX9.cpp
@@ -666,29 +666,8 @@ void DrawEngineDX9::DoFlush() {
 		decOptions_.applySkinInDecode = g_Config.bSoftwareSkinning;
 	}
 
-	gpuStats.numFlushes++;
-	gpuStats.numDrawCalls += numDrawInds_;
-	gpuStats.numVertexDecodes += numDrawVerts_;
-	gpuStats.numVertsSubmitted += vertexCountInDrawCalls_;
-
-	// TODO: The below should be shared.
-
-	indexGen.Reset();
-	decodedVerts_ = 0;
-	numDrawVerts_ = 0;
-	numDrawInds_ = 0;
-	vertexCountInDrawCalls_ = 0;
-	decodeVertsCounter_ = 0;
-	decodeIndsCounter_ = 0;
-	gstate_c.vertexFullAlpha = true;
+	ResetAfterDrawInline();
 	framebufferManager_->SetColorUpdated(gstate_c.skipDrawReason);
-
-	// Now seems as good a time as any to reset the min/max coords, which we may examine later.
-	gstate_c.vertBounds.minU = 512;
-	gstate_c.vertBounds.minV = 512;
-	gstate_c.vertBounds.maxU = 0;
-	gstate_c.vertBounds.maxV = 0;
-
 	GPUDebug::NotifyDraw();
 }
 

diff --git a/GPU/GLES/DrawEngineGLES.cpp b/GPU/GLES/DrawEngineGLES.cpp
@@ -473,30 +473,8 @@ void DrawEngineGLES::DoFlush() {
 	}
 
 bail:
-	gpuStats.numFlushes++;
-	gpuStats.numDrawCalls += numDrawInds_;
-	gpuStats.numVertexDecodes += numDrawVerts_;
-	gpuStats.numVertsSubmitted += vertexCountInDrawCalls_;
-
-	// TODO: When the next flush has the same vertex format, we can continue with the same offset in the vertex buffer,
-	// and start indexing from a higher value. This is very friendly to OpenGL (where we can't rely on baseindex if we
-	// wanted to avoid rebinding the vertex input every time).
-	indexGen.Reset();
-	decodedVerts_ = 0;
-	numDrawVerts_ = 0;
-	numDrawInds_ = 0;
-	vertexCountInDrawCalls_ = 0;
-	decodeVertsCounter_ = 0;
-	decodeIndsCounter_ = 0;
-	gstate_c.vertexFullAlpha = true;
+	ResetAfterDrawInline();
 	framebufferManager_->SetColorUpdated(gstate_c.skipDrawReason);
-
-	// Now seems as good a time as any to reset the min/max coords, which we may examine later.
-	gstate_c.vertBounds.minU = 512;
-	gstate_c.vertBounds.minV = 512;
-	gstate_c.vertBounds.maxU = 0;
-	gstate_c.vertBounds.maxV = 0;
-
 	GPUDebug::NotifyDraw();
 }
 

diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp
@@ -1014,27 +1014,10 @@ void DrawEngineVulkan::DoFlush() {
 		decOptions_.applySkinInDecode = g_Config.bSoftwareSkinning;
 	}
 
-	gpuStats.numFlushes++;
-	gpuStats.numDrawCalls += numDrawInds_;
-	gpuStats.numVertexDecodes += numDrawVerts_;
-	gpuStats.numVertsSubmitted += vertexCountInDrawCalls_;
+	ResetAfterDrawInline();
 
-	indexGen.Reset();
-	decodedVerts_ = 0;
-	numDrawVerts_ = 0;
-	numDrawInds_ = 0;
-	vertexCountInDrawCalls_ = 0;
-	decodeIndsCounter_ = 0;
-	decodeVertsCounter_ = 0;
-	gstate_c.vertexFullAlpha = true;
 	framebufferManager_->SetColorUpdated(gstate_c.skipDrawReason);
 
-	// Now seems as good a time as any to reset the min/max coords, which we may examine later.
-	gstate_c.vertBounds.minU = 512;
-	gstate_c.vertBounds.minV = 512;
-	gstate_c.vertBounds.maxU = 0;
-	gstate_c.vertBounds.maxV = 0;
-
 	GPUDebug::NotifyDraw();
 }