From 3aaeb2b9ef3f6b9cde69c77ecdf96e8defc996d5 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Fri, 30 Apr 2021 14:57:12 -0700 Subject: Convert OpcodeDecoder::Opcode and OpcodeDecoder::Primitive to enum class --- Source/Core/VideoBackends/Software/SetupUnit.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'Source/Core/VideoBackends/Software/SetupUnit.cpp') diff --git a/Source/Core/VideoBackends/Software/SetupUnit.cpp b/Source/Core/VideoBackends/Software/SetupUnit.cpp index b2488a63d8..48ab2b2d9b 100644 --- a/Source/Core/VideoBackends/Software/SetupUnit.cpp +++ b/Source/Core/VideoBackends/Software/SetupUnit.cpp @@ -9,9 +9,9 @@ #include "VideoBackends/Software/Clipper.h" #include "VideoCommon/OpcodeDecoding.h" -void SetupUnit::Init(u8 primitiveType) +void SetupUnit::Init(OpcodeDecoder::Primitive primitive_type) { - m_PrimType = primitiveType; + m_PrimType = primitive_type; m_VertexCounter = 0; m_VertPointer[0] = &m_Vertices[0]; @@ -28,31 +28,32 @@ OutputVertexData* SetupUnit::GetVertex() void SetupUnit::SetupVertex() { + using OpcodeDecoder::Primitive; switch (m_PrimType) { - case OpcodeDecoder::GX_DRAW_QUADS: + case Primitive::GX_DRAW_QUADS: SetupQuad(); break; - case OpcodeDecoder::GX_DRAW_QUADS_2: + case Primitive::GX_DRAW_QUADS_2: WARN_LOG_FMT(VIDEO, "Non-standard primitive drawing command GL_DRAW_QUADS_2"); SetupQuad(); break; - case OpcodeDecoder::GX_DRAW_TRIANGLES: + case Primitive::GX_DRAW_TRIANGLES: SetupTriangle(); break; - case OpcodeDecoder::GX_DRAW_TRIANGLE_STRIP: + case Primitive::GX_DRAW_TRIANGLE_STRIP: SetupTriStrip(); break; - case OpcodeDecoder::GX_DRAW_TRIANGLE_FAN: + case Primitive::GX_DRAW_TRIANGLE_FAN: SetupTriFan(); break; - case OpcodeDecoder::GX_DRAW_LINES: + case Primitive::GX_DRAW_LINES: SetupLine(); break; - case OpcodeDecoder::GX_DRAW_LINE_STRIP: + case Primitive::GX_DRAW_LINE_STRIP: SetupLineStrip(); break; - case OpcodeDecoder::GX_DRAW_POINTS: + case Primitive::GX_DRAW_POINTS: SetupPoint(); break; } -- cgit v1.2.3