diff options
Diffstat (limited to 'Source/Core/VideoCommon/IndexGenerator.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/IndexGenerator.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/Source/Core/VideoCommon/IndexGenerator.cpp b/Source/Core/VideoCommon/IndexGenerator.cpp index d71f6c8292..be2dc99e3a 100644 --- a/Source/Core/VideoCommon/IndexGenerator.cpp +++ b/Source/Core/VideoCommon/IndexGenerator.cpp @@ -202,25 +202,27 @@ u16* AddPoints(u16* index_ptr, u32 num_verts, u32 index) void IndexGenerator::Init() { + using OpcodeDecoder::Primitive; + if (g_Config.backend_info.bSupportsPrimitiveRestart) { - m_primitive_table[OpcodeDecoder::GX_DRAW_QUADS] = AddQuads<true>; - m_primitive_table[OpcodeDecoder::GX_DRAW_QUADS_2] = AddQuads_nonstandard<true>; - m_primitive_table[OpcodeDecoder::GX_DRAW_TRIANGLES] = AddList<true>; - m_primitive_table[OpcodeDecoder::GX_DRAW_TRIANGLE_STRIP] = AddStrip<true>; - m_primitive_table[OpcodeDecoder::GX_DRAW_TRIANGLE_FAN] = AddFan<true>; + m_primitive_table[Primitive::GX_DRAW_QUADS] = AddQuads<true>; + m_primitive_table[Primitive::GX_DRAW_QUADS_2] = AddQuads_nonstandard<true>; + m_primitive_table[Primitive::GX_DRAW_TRIANGLES] = AddList<true>; + m_primitive_table[Primitive::GX_DRAW_TRIANGLE_STRIP] = AddStrip<true>; + m_primitive_table[Primitive::GX_DRAW_TRIANGLE_FAN] = AddFan<true>; } else { - m_primitive_table[OpcodeDecoder::GX_DRAW_QUADS] = AddQuads<false>; - m_primitive_table[OpcodeDecoder::GX_DRAW_QUADS_2] = AddQuads_nonstandard<false>; - m_primitive_table[OpcodeDecoder::GX_DRAW_TRIANGLES] = AddList<false>; - m_primitive_table[OpcodeDecoder::GX_DRAW_TRIANGLE_STRIP] = AddStrip<false>; - m_primitive_table[OpcodeDecoder::GX_DRAW_TRIANGLE_FAN] = AddFan<false>; + m_primitive_table[Primitive::GX_DRAW_QUADS] = AddQuads<false>; + m_primitive_table[Primitive::GX_DRAW_QUADS_2] = AddQuads_nonstandard<false>; + m_primitive_table[Primitive::GX_DRAW_TRIANGLES] = AddList<false>; + m_primitive_table[Primitive::GX_DRAW_TRIANGLE_STRIP] = AddStrip<false>; + m_primitive_table[Primitive::GX_DRAW_TRIANGLE_FAN] = AddFan<false>; } - m_primitive_table[OpcodeDecoder::GX_DRAW_LINES] = AddLineList; - m_primitive_table[OpcodeDecoder::GX_DRAW_LINE_STRIP] = AddLineStrip; - m_primitive_table[OpcodeDecoder::GX_DRAW_POINTS] = AddPoints; + m_primitive_table[Primitive::GX_DRAW_LINES] = AddLineList; + m_primitive_table[Primitive::GX_DRAW_LINE_STRIP] = AddLineStrip; + m_primitive_table[Primitive::GX_DRAW_POINTS] = AddPoints; } void IndexGenerator::Start(u16* index_ptr) @@ -230,7 +232,7 @@ void IndexGenerator::Start(u16* index_ptr) m_base_index = 0; } -void IndexGenerator::AddIndices(int primitive, u32 num_vertices) +void IndexGenerator::AddIndices(OpcodeDecoder::Primitive primitive, u32 num_vertices) { m_index_buffer_current = m_primitive_table[primitive](m_index_buffer_current, num_vertices, m_base_index); |