Code simplification

hrydgard · Oct 4, 2023 · b09f120 · b09f120
1 parent 6229c81
commit b09f120
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/GPU/Common/DrawEngineCommon.cpp b/GPU/Common/DrawEngineCommon.cpp
@@ -217,8 +217,7 @@ void DrawEngineCommon::UpdatePlanes() {
 	Vec2f minViewport = (minOffset_ - Vec2f(gstate.getViewportXCenter(), gstate.getViewportYCenter())) * inverseViewportScale;
 	Vec2f maxViewport = (maxOffset_ - Vec2f(gstate.getViewportXCenter(), gstate.getViewportYCenter())) * inverseViewportScale;
 
-	Lin::Matrix4x4 applyViewport;
-	applyViewport.empty();
+	Lin::Matrix4x4 applyViewport{};
 	// Scale to the viewport's size.
 	applyViewport.xx = 2.0f / (maxViewport.x - minViewport.x);
 	applyViewport.yy = 2.0f / (maxViewport.y - minViewport.y);
@@ -265,6 +264,14 @@ bool DrawEngineCommon::TestBoundingBox(const void *vdata, const void *inds, int
 	if (gstate_c.Use(GPU_USE_VIRTUAL_REALITY))
 		return true;
 
+	// Due to world matrix updates per "thing", this isn't quite as effective as it could be if we did world transform
+	// in here as well. Though, it still does cut down on a lot of updates in Tekken 6.
+	if (gstate_c.IsDirty(DIRTY_CULL_PLANES)) {
+		UpdatePlanes();
+		gpuStats.numPlaneUpdates++;
+		gstate_c.Clean(DIRTY_CULL_PLANES);
+	}
+
 	// Try to skip NormalizeVertices if it's pure positions. No need to bother with a vertex decoder
 	// and a large vertex format.
 	if ((vertType & 0xFFFFFF) == GE_VTYPE_POS_FLOAT && !inds) {
@@ -311,15 +318,17 @@ bool DrawEngineCommon::TestBoundingBox(const void *vdata, const void *inds, int
 			switch (vertType & GE_VTYPE_POS_MASK) {
 			case GE_VTYPE_POS_8BIT:
 				for (int i = 0; i < vertexCount; i++) {
+					const s8 *data = (const s8 *)vdata + i * stride + offset;
 					for (int j = 0; j < 3; j++) {
-						verts[i * 3 + j] = ((const s8 *)vdata + i * stride + offset)[j] * (1.0f / 128.0f);
+						verts[i * 3 + j] = data[j] * (1.0f / 128.0f);
 					}
 				}
 				break;
 			case GE_VTYPE_POS_16BIT:
 				for (int i = 0; i < vertexCount; i++) {
+					const s16 *data = ((const s16 *)((const s8 *)vdata + i * stride + offset));
 					for (int j = 0; j < 3; j++) {
-						verts[i * 3 + j] = ((const s16 *)((const s8 *)vdata + i * stride + offset))[j] * (1.0f / 32768.0f);
+						verts[i * 3 + j] = data[j] * (1.0f / 32768.0f);
 					}
 				}
 				break;
@@ -332,14 +341,6 @@ bool DrawEngineCommon::TestBoundingBox(const void *vdata, const void *inds, int
 		}
 	}
 
-	// Due to world matrix updates per "thing", this isn't quite as effective as it could be if we did world transform
-	// in here as well. Though, it still does cut down on a lot of updates in Tekken 6.
-	if (gstate_c.IsDirty(DIRTY_CULL_PLANES)) {
-		UpdatePlanes();
-		gpuStats.numPlaneUpdates++;
-		gstate_c.Clean(DIRTY_CULL_PLANES);
-	}
-
 	// Note: near/far are not checked without clamp/clip enabled, so we skip those planes.
 	int totalPlanes = gstate.isDepthClampEnabled() ? 6 : 4;
 	for (int plane = 0; plane < totalPlanes; plane++) {