Merge pull request #11228 from Pokechu22/statistics-macros

VideoCommon/Statistics: Require semicolons after statistics macros
dolphin-emu · Nov 4, 2022 · 26b68f1 · 26b68f1
2 parents 8b4e315 + fe559f3
commit 26b68f1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/Source/Core/VideoBackends/Software/Clipper.cpp b/Source/Core/VideoBackends/Software/Clipper.cpp
@@ -287,11 +287,11 @@ static void ClipLine(int* indices)
 
 void ProcessTriangle(OutputVertexData* v0, OutputVertexData* v1, OutputVertexData* v2)
 {
-  INCSTAT(g_stats.this_frame.num_triangles_in)
+  INCSTAT(g_stats.this_frame.num_triangles_in);
 
   if (IsTriviallyRejected(v0, v1, v2))
   {
-    INCSTAT(g_stats.this_frame.num_triangles_rejected)
+    INCSTAT(g_stats.this_frame.num_triangles_rejected);
     // NOTE: The slope used by zfreeze shouldn't be updated if the triangle is
     // trivially rejected during clipping
     return;
@@ -308,7 +308,7 @@ void ProcessTriangle(OutputVertexData* v0, OutputVertexData* v1, OutputVertexDat
       PerspectiveDivide(v1);
       PerspectiveDivide(v2);
       Rasterizer::UpdateZSlope(v0, v1, v2, bpmem.scissorOffset.x * 2, bpmem.scissorOffset.y * 2);
-      INCSTAT(g_stats.this_frame.num_triangles_culled)
+      INCSTAT(g_stats.this_frame.num_triangles_culled);
       return;
     }
   }
@@ -321,7 +321,7 @@ void ProcessTriangle(OutputVertexData* v0, OutputVertexData* v1, OutputVertexDat
       PerspectiveDivide(v2);
       PerspectiveDivide(v1);
       Rasterizer::UpdateZSlope(v0, v2, v1, bpmem.scissorOffset.x * 2, bpmem.scissorOffset.y * 2);
-      INCSTAT(g_stats.this_frame.num_triangles_culled)
+      INCSTAT(g_stats.this_frame.num_triangles_culled);
       return;
     }
   }

diff --git a/Source/Core/VideoCommon/Statistics.h b/Source/Core/VideoCommon/Statistics.h
@@ -90,11 +90,32 @@ extern Statistics g_stats;
 #define STATISTICS
 
 #ifdef STATISTICS
-#define INCSTAT(a) (a)++;
-#define ADDSTAT(a, b) (a) += (b);
-#define SETSTAT(a, x) (a) = (int)(x);
+#define INCSTAT(a)                                                                                 \
+  do                                                                                               \
+  {                                                                                                \
+    (a)++;                                                                                         \
+  } while (false)
+#define ADDSTAT(a, b)                                                                              \
+  do                                                                                               \
+  {                                                                                                \
+    (a) += (b);                                                                                    \
+  } while (false)
+#define SETSTAT(a, x)                                                                              \
+  do                                                                                               \
+  {                                                                                                \
+    (a) = static_cast<int>(x);                                                                     \
+  } while (false)
 #else
-#define INCSTAT(a) ;
-#define ADDSTAT(a, b) ;
-#define SETSTAT(a, x) ;
+#define INCSTAT(a)                                                                                 \
+  do                                                                                               \
+  {                                                                                                \
+  } while (false)
+#define ADDSTAT(a, b)                                                                              \
+  do                                                                                               \
+  {                                                                                                \
+  } while (false)
+#define SETSTAT(a, x)                                                                              \
+  do                                                                                               \
+  {                                                                                                \
+  } while (false)
 #endif