diff options
| author | Lioncash <mathew1800@gmail.com> | 2017-02-07 23:11:04 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2017-02-08 00:05:17 -0500 |
| commit | d9d069e02464476cf2bcf7bd6389f3c8f2a8c21e (patch) | |
| tree | 416365cb8c229befc916b810f495eeb67887db1d /Source/Core/VideoBackends/Software | |
| parent | 22fbcc67fca2496e800151573ebe4fae8d9218a3 (diff) | |
OpcodeDecoding: Convert #defines into enum constants
Gets several constants out of global scope.
Diffstat (limited to 'Source/Core/VideoBackends/Software')
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWVertexLoader.cpp | 9 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/SetupUnit.cpp | 16 |
2 files changed, 13 insertions, 12 deletions
diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp index ca58450971..4115aa7479 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp @@ -62,14 +62,15 @@ void SWVertexLoader::vFlush() switch (m_current_primitive_type) { case PRIMITIVE_POINTS: - primitiveType = GX_DRAW_POINTS; + primitiveType = OpcodeDecoder::GX_DRAW_POINTS; break; case PRIMITIVE_LINES: - primitiveType = GX_DRAW_LINES; + primitiveType = OpcodeDecoder::GX_DRAW_LINES; break; case PRIMITIVE_TRIANGLES: - primitiveType = g_ActiveConfig.backend_info.bSupportsPrimitiveRestart ? GX_DRAW_TRIANGLE_STRIP : - GX_DRAW_TRIANGLES; + primitiveType = g_ActiveConfig.backend_info.bSupportsPrimitiveRestart ? + OpcodeDecoder::GX_DRAW_TRIANGLE_STRIP : + OpcodeDecoder::GX_DRAW_TRIANGLES; break; } diff --git a/Source/Core/VideoBackends/Software/SetupUnit.cpp b/Source/Core/VideoBackends/Software/SetupUnit.cpp index 306ca184b6..4a4600fab4 100644 --- a/Source/Core/VideoBackends/Software/SetupUnit.cpp +++ b/Source/Core/VideoBackends/Software/SetupUnit.cpp @@ -33,29 +33,29 @@ void SetupUnit::SetupVertex() { switch (m_PrimType) { - case GX_DRAW_QUADS: + case OpcodeDecoder::GX_DRAW_QUADS: SetupQuad(); break; - case GX_DRAW_QUADS_2: + case OpcodeDecoder::GX_DRAW_QUADS_2: WARN_LOG(VIDEO, "Non-standard primitive drawing command GL_DRAW_QUADS_2"); SetupQuad(); break; - case GX_DRAW_TRIANGLES: + case OpcodeDecoder::GX_DRAW_TRIANGLES: SetupTriangle(); break; - case GX_DRAW_TRIANGLE_STRIP: + case OpcodeDecoder::GX_DRAW_TRIANGLE_STRIP: SetupTriStrip(); break; - case GX_DRAW_TRIANGLE_FAN: + case OpcodeDecoder::GX_DRAW_TRIANGLE_FAN: SetupTriFan(); break; - case GX_DRAW_LINES: + case OpcodeDecoder::GX_DRAW_LINES: SetupLine(); break; - case GX_DRAW_LINE_STRIP: + case OpcodeDecoder::GX_DRAW_LINE_STRIP: SetupLineStrip(); break; - case GX_DRAW_POINTS: + case OpcodeDecoder::GX_DRAW_POINTS: SetupPoint(); break; } |