Reformat all the things. Have fun with merge conflicts.

This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions

View File

@ -20,28 +20,27 @@ class SetupUnit;
class SWVertexLoader : public VertexManagerBase
{
public:
SWVertexLoader();
~SWVertexLoader();
SWVertexLoader();
~SWVertexLoader();
NativeVertexFormat* CreateNativeVertexFormat(const PortableVertexDeclaration& vdec) override;
NativeVertexFormat* CreateNativeVertexFormat(const PortableVertexDeclaration& vdec) override;
protected:
void ResetBuffer(u32 stride) override;
u16* GetIndexBuffer() { return &LocalIBuffer[0]; }
void ResetBuffer(u32 stride) override;
u16* GetIndexBuffer() { return &LocalIBuffer[0]; }
private:
void vFlush(bool useDstAlpha) override;
std::vector<u8> LocalVBuffer;
std::vector<u16> LocalIBuffer;
void vFlush(bool useDstAlpha) override;
std::vector<u8> LocalVBuffer;
std::vector<u16> LocalIBuffer;
InputVertexData m_Vertex;
InputVertexData m_Vertex;
void ParseVertex(const PortableVertexDeclaration& vdec, int index);
void ParseVertex(const PortableVertexDeclaration& vdec, int index);
SetupUnit *m_SetupUnit;
SetupUnit* m_SetupUnit;
bool m_TexGenSpecialCase;
bool m_TexGenSpecialCase;
public:
void SetFormat(u8 attributeIndex, u8 primitiveType);
void SetFormat(u8 attributeIndex, u8 primitiveType);
};