Merge pull request #4268 from lioncash/cast

VertexManagerBase: Get rid of a u16 cast
dolphin-emu · Oct 1, 2016 · 4eeb158 · 4eeb158
2 parents 8017e11 + 361c7c9
commit 4eeb158
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/Source/Core/VideoCommon/VertexManagerBase.h b/Source/Core/VideoCommon/VertexManagerBase.h
@@ -33,18 +33,19 @@ struct Slope
 class VertexManagerBase
 {
 private:
-  static const u32 SMALLEST_POSSIBLE_VERTEX = sizeof(float) * 3;  // 3 pos
-  static const u32 LARGEST_POSSIBLE_VERTEX =
-      sizeof(float) * 45 + sizeof(u32) * 2;  // 3 pos, 3*3 normal, 2*u32 color, 8*4 tex, 1 posMat
+  // 3 pos
+  static constexpr u32 SMALLEST_POSSIBLE_VERTEX = sizeof(float) * 3;
+  // 3 pos, 3*3 normal, 2*u32 color, 8*4 tex, 1 posMat
+  static constexpr u32 LARGEST_POSSIBLE_VERTEX = sizeof(float) * 45 + sizeof(u32) * 2;
 
-  static const u32 MAX_PRIMITIVES_PER_COMMAND = (u16)-1;
+  static constexpr u32 MAX_PRIMITIVES_PER_COMMAND = 65535;
 
 public:
-  static const u32 MAXVBUFFERSIZE =
+  static constexpr u32 MAXVBUFFERSIZE =
       ROUND_UP_POW2(MAX_PRIMITIVES_PER_COMMAND * LARGEST_POSSIBLE_VERTEX);
 
   // We may convert triangle-fans to triangle-lists, almost 3x as many indices.
-  static const u32 MAXIBUFFERSIZE = ROUND_UP_POW2(MAX_PRIMITIVES_PER_COMMAND * 3);
+  static constexpr u32 MAXIBUFFERSIZE = ROUND_UP_POW2(MAX_PRIMITIVES_PER_COMMAND * 3);
 
   VertexManagerBase();
   // needs to be virtual for DX11's dtor