diff options
| author | Matthew Parlane <parlane@gmail.com> | 2017-02-08 18:12:11 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-08 18:12:11 +1300 |
| commit | 691abc223bce85e9857942214748dc6bba4216db (patch) | |
| tree | 593ff2dec789103aec0ee2daf6c5a72dd980fcb1 /Source/Core/VideoCommon/VertexManagerBase.cpp | |
| parent | 5b7c0d86cdb240917503928cde0830f91e4de6fa (diff) | |
| parent | d9d069e02464476cf2bcf7bd6389f3c8f2a8c21e (diff) | |
Merge pull request #4859 from lioncash/opcodedecoder
OpcodeDecoding: Convert #defines into enum constants
Diffstat (limited to 'Source/Core/VideoCommon/VertexManagerBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VertexManagerBase.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
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: |