piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

OpcodeDecoding: Convert #defines into enum constants

Browse Source 
Gets several constants out of global scope.
This commit is contained in:
Lioncash
2017-02-07 23:11:04 -05:00
parent 22fbcc67fc
commit d9d069e024
7 changed files with 110 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/VideoCommon/IndexGenerator.cpp
View File

@ -24,23 +24,23 @@ void IndexGenerator::Init()
{
if (g_Config.backend_info.bSupportsPrimitiveRestart)
{
primitive_table[GX_DRAW_QUADS] = IndexGenerator::AddQuads<true>;
primitive_table[GX_DRAW_QUADS_2] = IndexGenerator::AddQuads_nonstandard<true>;
primitive_table[GX_DRAW_TRIANGLES] = IndexGenerator::AddList<true>;
primitive_table[GX_DRAW_TRIANGLE_STRIP] = IndexGenerator::AddStrip<true>;
primitive_table[GX_DRAW_TRIANGLE_FAN] = IndexGenerator::AddFan<true>;
primitive_table[OpcodeDecoder::GX_DRAW_QUADS] = AddQuads<true>;
primitive_table[OpcodeDecoder::GX_DRAW_QUADS_2] = AddQuads_nonstandard<true>;
primitive_table[OpcodeDecoder::GX_DRAW_TRIANGLES] = AddList<true>;
primitive_table[OpcodeDecoder::GX_DRAW_TRIANGLE_STRIP] = AddStrip<true>;
primitive_table[OpcodeDecoder::GX_DRAW_TRIANGLE_FAN] = AddFan<true>;
}
else
{
primitive_table[GX_DRAW_QUADS] = IndexGenerator::AddQuads<false>;
primitive_table[GX_DRAW_QUADS_2] = IndexGenerator::AddQuads_nonstandard<false>;
primitive_table[GX_DRAW_TRIANGLES] = IndexGenerator::AddList<false>;
primitive_table[GX_DRAW_TRIANGLE_STRIP] = IndexGenerator::AddStrip<false>;
primitive_table[GX_DRAW_TRIANGLE_FAN] = IndexGenerator::AddFan<false>;
primitive_table[OpcodeDecoder::GX_DRAW_QUADS] = AddQuads<false>;
primitive_table[OpcodeDecoder::GX_DRAW_QUADS_2] = AddQuads_nonstandard<false>;
primitive_table[OpcodeDecoder::GX_DRAW_TRIANGLES] = AddList<false>;
primitive_table[OpcodeDecoder::GX_DRAW_TRIANGLE_STRIP] = AddStrip<false>;
primitive_table[OpcodeDecoder::GX_DRAW_TRIANGLE_FAN] = AddFan<false>;
}
primitive_table[GX_DRAW_LINES] = &IndexGenerator::AddLineList;
primitive_table[GX_DRAW_LINE_STRIP] = &IndexGenerator::AddLineStrip;
primitive_table[GX_DRAW_POINTS] = &IndexGenerator::AddPoints;
primitive_table[OpcodeDecoder::GX_DRAW_LINES] = &AddLineList;
primitive_table[OpcodeDecoder::GX_DRAW_LINE_STRIP] = &AddLineStrip;
primitive_table[OpcodeDecoder::GX_DRAW_POINTS] = &AddPoints;
}
void IndexGenerator::Start(u16* Indexptr)

59
Source/Core/VideoCommon/OpcodeDecoding.h
View File

@ -8,39 +8,48 @@
class DataReader;
#define GX_NOP 0x00
#define GX_UNKNOWN_RESET 0x01
namespace OpcodeDecoder
{
enum
{
GX_NOP = 0x00,
GX_UNKNOWN_RESET = 0x01,
#define GX_LOAD_BP_REG 0x61
#define GX_LOAD_CP_REG 0x08
#define GX_LOAD_XF_REG 0x10
#define GX_LOAD_INDX_A 0x20
#define GX_LOAD_INDX_B 0x28
#define GX_LOAD_INDX_C 0x30
#define GX_LOAD_INDX_D 0x38
GX_LOAD_BP_REG = 0x61,
GX_LOAD_CP_REG = 0x08,
GX_LOAD_XF_REG = 0x10,
GX_LOAD_INDX_A = 0x20,
GX_LOAD_INDX_B = 0x28,
GX_LOAD_INDX_C = 0x30,
GX_LOAD_INDX_D = 0x38,
#define GX_CMD_CALL_DL 0x40
#define GX_CMD_UNKNOWN_METRICS 0x44
#define GX_CMD_INVL_VC 0x48
GX_CMD_CALL_DL = 0x40,
GX_CMD_UNKNOWN_METRICS = 0x44,
GX_CMD_INVL_VC = 0x48
};
#define GX_PRIMITIVE_MASK 0x78
#define GX_PRIMITIVE_SHIFT 3
#define GX_VAT_MASK 0x07
enum
{
GX_PRIMITIVE_MASK = 0x78,
GX_PRIMITIVE_SHIFT = 3,
GX_VAT_MASK = 0x07
};
// These values are the values extracted using GX_PRIMITIVE_MASK
// and GX_PRIMITIVE_SHIFT.
// GX_DRAW_QUADS_2 behaves the same way as GX_DRAW_QUADS.
#define GX_DRAW_QUADS 0x0 // 0x80
#define GX_DRAW_QUADS_2 0x1 // 0x88
#define GX_DRAW_TRIANGLES 0x2 // 0x90
#define GX_DRAW_TRIANGLE_STRIP 0x3 // 0x98
#define GX_DRAW_TRIANGLE_FAN 0x4 // 0xA0
#define GX_DRAW_LINES 0x5 // 0xA8
#define GX_DRAW_LINE_STRIP 0x6 // 0xB0
#define GX_DRAW_POINTS 0x7 // 0xB8
namespace OpcodeDecoder
enum
{
GX_DRAW_QUADS = 0x0, // 0x80
GX_DRAW_QUADS_2 = 0x1, // 0x88
GX_DRAW_TRIANGLES = 0x2, // 0x90
GX_DRAW_TRIANGLE_STRIP = 0x3, // 0x98
GX_DRAW_TRIANGLE_FAN = 0x4, // 0xA0
GX_DRAW_LINES = 0x5, // 0xA8
GX_DRAW_LINE_STRIP = 0x6, // 0xB0
GX_DRAW_POINTS = 0x7 // 0xB8
};
void Init();
template <bool is_preprocess = false>

32
Source/Core/VideoCommon/VertexManagerBase.cpp
View File

@ -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: