From d9d069e02464476cf2bcf7bd6389f3c8f2a8c21e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 7 Feb 2017 23:11:04 -0500 Subject: OpcodeDecoding: Convert #defines into enum constants Gets several constants out of global scope. --- Source/Core/VideoCommon/VertexManagerBase.cpp | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'Source/Core/VideoCommon/VertexManagerBase.cpp') diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp index f4a32eada3..2fd3affcaf 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/VertexManagerBase.cpp @@ -107,22 +107,22 @@ u32 VertexManagerBase::GetRemainingIndices(int primitive) { switch (primitive) { - case GX_DRAW_QUADS: - case GX_DRAW_QUADS_2: + case OpcodeDecoder::GX_DRAW_QUADS: + case OpcodeDecoder::GX_DRAW_QUADS_2: return index_len / 5 * 4; - case GX_DRAW_TRIANGLES: + case OpcodeDecoder::GX_DRAW_TRIANGLES: return index_len / 4 * 3; - case GX_DRAW_TRIANGLE_STRIP: + case OpcodeDecoder::GX_DRAW_TRIANGLE_STRIP: return index_len / 1 - 1; - case GX_DRAW_TRIANGLE_FAN: + case OpcodeDecoder::GX_DRAW_TRIANGLE_FAN: return index_len / 6 * 4 + 1; - case GX_DRAW_LINES: + case OpcodeDecoder::GX_DRAW_LINES: return index_len; - case GX_DRAW_LINE_STRIP: + case OpcodeDecoder::GX_DRAW_LINE_STRIP: return index_len / 2 + 1; - case GX_DRAW_POINTS: + case OpcodeDecoder::GX_DRAW_POINTS: return index_len; default: @@ -133,22 +133,22 @@ u32 VertexManagerBase::GetRemainingIndices(int primitive) { switch (primitive) { - case GX_DRAW_QUADS: - case GX_DRAW_QUADS_2: + case OpcodeDecoder::GX_DRAW_QUADS: + case OpcodeDecoder::GX_DRAW_QUADS_2: return index_len / 6 * 4; - case GX_DRAW_TRIANGLES: + case OpcodeDecoder::GX_DRAW_TRIANGLES: return index_len; - case GX_DRAW_TRIANGLE_STRIP: + case OpcodeDecoder::GX_DRAW_TRIANGLE_STRIP: return index_len / 3 + 2; - case GX_DRAW_TRIANGLE_FAN: + case OpcodeDecoder::GX_DRAW_TRIANGLE_FAN: return index_len / 3 + 2; - case GX_DRAW_LINES: + case OpcodeDecoder::GX_DRAW_LINES: return index_len; - case GX_DRAW_LINE_STRIP: + case OpcodeDecoder::GX_DRAW_LINE_STRIP: return index_len / 2 + 1; - case GX_DRAW_POINTS: + case OpcodeDecoder::GX_DRAW_POINTS: return index_len; default: -- cgit v1.2.3