mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-09-11 10:40:58 +02:00
Merge pull request #13879 from Tilka/get_vertex_size
OpcodeDecoder: provide default GetVertexSize() implementation
This commit is contained in:
@@ -57,11 +57,6 @@ public:
|
|||||||
|
|
||||||
OPCODE_CALLBACK(CPState& GetCPState()) { return m_cpmem; }
|
OPCODE_CALLBACK(CPState& GetCPState()) { return m_cpmem; }
|
||||||
|
|
||||||
OPCODE_CALLBACK(u32 GetVertexSize(u8 vat))
|
|
||||||
{
|
|
||||||
return VertexLoaderBase::GetVertexSize(GetCPState().vtx_desc, GetCPState().vtx_attr[vat]);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool m_start_of_primitives = false;
|
bool m_start_of_primitives = false;
|
||||||
bool m_end_of_primitives = false;
|
bool m_end_of_primitives = false;
|
||||||
bool m_efb_copy = false;
|
bool m_efb_copy = false;
|
||||||
|
@@ -50,11 +50,6 @@ public:
|
|||||||
|
|
||||||
OPCODE_CALLBACK(CPState& GetCPState()) { return m_cpmem; }
|
OPCODE_CALLBACK(CPState& GetCPState()) { return m_cpmem; }
|
||||||
|
|
||||||
OPCODE_CALLBACK(u32 GetVertexSize(u8 vat))
|
|
||||||
{
|
|
||||||
return VertexLoaderBase::GetVertexSize(GetCPState().vtx_desc, GetCPState().vtx_attr[vat]);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void ProcessVertexComponent(CPArray array_index, VertexComponentFormat array_type,
|
void ProcessVertexComponent(CPArray array_index, VertexComponentFormat array_type,
|
||||||
u32 component_offset, u32 component_size, u32 vertex_size,
|
u32 component_offset, u32 component_size, u32 vertex_size,
|
||||||
|
@@ -316,11 +316,6 @@ public:
|
|||||||
|
|
||||||
OPCODE_CALLBACK(CPState& GetCPState()) { return m_cpmem; }
|
OPCODE_CALLBACK(CPState& GetCPState()) { return m_cpmem; }
|
||||||
|
|
||||||
OPCODE_CALLBACK(u32 GetVertexSize(const u8 vat))
|
|
||||||
{
|
|
||||||
return VertexLoaderBase::GetVertexSize(GetCPState().vtx_desc, GetCPState().vtx_attr[vat]);
|
|
||||||
}
|
|
||||||
|
|
||||||
QString text;
|
QString text;
|
||||||
CPState m_cpmem;
|
CPState m_cpmem;
|
||||||
};
|
};
|
||||||
@@ -738,11 +733,6 @@ public:
|
|||||||
|
|
||||||
OPCODE_CALLBACK(CPState& GetCPState()) { return m_cpmem; }
|
OPCODE_CALLBACK(CPState& GetCPState()) { return m_cpmem; }
|
||||||
|
|
||||||
OPCODE_CALLBACK(u32 GetVertexSize(const u8 vat))
|
|
||||||
{
|
|
||||||
return VertexLoaderBase::GetVertexSize(GetCPState().vtx_desc, GetCPState().vtx_attr[vat]);
|
|
||||||
}
|
|
||||||
|
|
||||||
QString text;
|
QString text;
|
||||||
CPState m_cpmem;
|
CPState m_cpmem;
|
||||||
};
|
};
|
||||||
|
@@ -111,7 +111,11 @@ public:
|
|||||||
// Get the current CP state. Needed for vertex decoding; will also be mutated for CP commands.
|
// Get the current CP state. Needed for vertex decoding; will also be mutated for CP commands.
|
||||||
virtual CPState& GetCPState() = 0;
|
virtual CPState& GetCPState() = 0;
|
||||||
|
|
||||||
virtual u32 GetVertexSize(u8 vat) = 0;
|
virtual u32 GetVertexSize(u8 vat)
|
||||||
|
{
|
||||||
|
const CPState& cpmem = GetCPState();
|
||||||
|
return VertexLoaderBase::GetVertexSize(cpmem.vtx_desc, cpmem.vtx_attr[vat]);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user