From 809117102e1c8007345c48aba5eabfec9cff26ee Mon Sep 17 00:00:00 2001 From: degasus Date: Sat, 13 Dec 2014 01:51:14 +0100 Subject: VideoCommon: split VertexLoaderBase from VertexLoader --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 139 +++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 Source/Core/VideoCommon/VertexLoaderBase.cpp (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp') diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp new file mode 100644 index 0000000000..4372729506 --- /dev/null +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -0,0 +1,139 @@ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include "Common/StringUtil.h" + +#include "VideoCommon/VertexLoader.h" +#include "VideoCommon/VertexLoaderBase.h" + +VertexLoaderBase::VertexLoaderBase(const TVtxDesc &vtx_desc, const VAT &vtx_attr) +{ + m_numLoadedVertices = 0; + m_VertexSize = 0; + m_native_vertex_format = nullptr; + + SetVAT(vtx_attr); + m_VtxDesc = vtx_desc; + m_vat = vtx_attr; +} + +void VertexLoaderBase::SetVAT(const VAT& vat) +{ + m_VtxAttr.PosElements = vat.g0.PosElements; + m_VtxAttr.PosFormat = vat.g0.PosFormat; + m_VtxAttr.PosFrac = vat.g0.PosFrac; + m_VtxAttr.NormalElements = vat.g0.NormalElements; + m_VtxAttr.NormalFormat = vat.g0.NormalFormat; + m_VtxAttr.color[0].Elements = vat.g0.Color0Elements; + m_VtxAttr.color[0].Comp = vat.g0.Color0Comp; + m_VtxAttr.color[1].Elements = vat.g0.Color1Elements; + m_VtxAttr.color[1].Comp = vat.g0.Color1Comp; + m_VtxAttr.texCoord[0].Elements = vat.g0.Tex0CoordElements; + m_VtxAttr.texCoord[0].Format = vat.g0.Tex0CoordFormat; + m_VtxAttr.texCoord[0].Frac = vat.g0.Tex0Frac; + m_VtxAttr.ByteDequant = vat.g0.ByteDequant; + m_VtxAttr.NormalIndex3 = vat.g0.NormalIndex3; + + m_VtxAttr.texCoord[1].Elements = vat.g1.Tex1CoordElements; + m_VtxAttr.texCoord[1].Format = vat.g1.Tex1CoordFormat; + m_VtxAttr.texCoord[1].Frac = vat.g1.Tex1Frac; + m_VtxAttr.texCoord[2].Elements = vat.g1.Tex2CoordElements; + m_VtxAttr.texCoord[2].Format = vat.g1.Tex2CoordFormat; + m_VtxAttr.texCoord[2].Frac = vat.g1.Tex2Frac; + m_VtxAttr.texCoord[3].Elements = vat.g1.Tex3CoordElements; + m_VtxAttr.texCoord[3].Format = vat.g1.Tex3CoordFormat; + m_VtxAttr.texCoord[3].Frac = vat.g1.Tex3Frac; + m_VtxAttr.texCoord[4].Elements = vat.g1.Tex4CoordElements; + m_VtxAttr.texCoord[4].Format = vat.g1.Tex4CoordFormat; + + m_VtxAttr.texCoord[4].Frac = vat.g2.Tex4Frac; + m_VtxAttr.texCoord[5].Elements = vat.g2.Tex5CoordElements; + m_VtxAttr.texCoord[5].Format = vat.g2.Tex5CoordFormat; + m_VtxAttr.texCoord[5].Frac = vat.g2.Tex5Frac; + m_VtxAttr.texCoord[6].Elements = vat.g2.Tex6CoordElements; + m_VtxAttr.texCoord[6].Format = vat.g2.Tex6CoordFormat; + m_VtxAttr.texCoord[6].Frac = vat.g2.Tex6Frac; + m_VtxAttr.texCoord[7].Elements = vat.g2.Tex7CoordElements; + m_VtxAttr.texCoord[7].Format = vat.g2.Tex7CoordFormat; + m_VtxAttr.texCoord[7].Frac = vat.g2.Tex7Frac; + + if (!m_VtxAttr.ByteDequant) + { + ERROR_LOG(VIDEO, "ByteDequant is set to zero"); + } +}; + +void VertexLoaderBase::AppendToString(std::string *dest) const +{ + dest->reserve(250); + + dest->append(GetName()); + dest->append(": "); + + static const char *posMode[4] = { + "Inv", + "Dir", + "I8", + "I16", + }; + static const char *posFormats[5] = { + "u8", "s8", "u16", "s16", "flt", + }; + static const char *colorFormat[8] = { + "565", + "888", + "888x", + "4444", + "6666", + "8888", + "Inv", + "Inv", + }; + + dest->append(StringFromFormat("%ib skin: %i P: %i %s-%s ", + m_VertexSize, (u32)m_VtxDesc.PosMatIdx, + m_VtxAttr.PosElements ? 3 : 2, posMode[m_VtxDesc.Position], posFormats[m_VtxAttr.PosFormat])); + + if (m_VtxDesc.Normal) + { + dest->append(StringFromFormat("Nrm: %i %s-%s ", + m_VtxAttr.NormalElements, posMode[m_VtxDesc.Normal], posFormats[m_VtxAttr.NormalFormat])); + } + + u64 color_mode[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1}; + for (int i = 0; i < 2; i++) + { + if (color_mode[i]) + { + dest->append(StringFromFormat("C%i: %i %s-%s ", i, m_VtxAttr.color[i].Elements, posMode[color_mode[i]], colorFormat[m_VtxAttr.color[i].Comp])); + } + } + u64 tex_mode[8] = { + m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord, + m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, m_VtxDesc.Tex7Coord + }; + for (int i = 0; i < 8; i++) + { + if (tex_mode[i]) + { + dest->append(StringFromFormat("T%i: %i %s-%s ", + i, m_VtxAttr.texCoord[i].Elements, posMode[tex_mode[i]], posFormats[m_VtxAttr.texCoord[i].Format])); + } + } + dest->append(StringFromFormat(" - %i v\n", m_numLoadedVertices)); +} + +VertexLoaderBase* VertexLoaderBase::CreateVertexLoader(const TVtxDesc& vtx_desc, const VAT& vtx_attr) +{ + VertexLoaderBase* loader; + + // last try: The old VertexLoader + loader = new VertexLoader(vtx_desc, vtx_attr); + if (loader->IsInitialized()) + return loader; + delete loader; + + PanicAlert("No Vertex Loader found."); + return nullptr; +} -- cgit v1.2.3 From 7edf6ec4e4506be5bf575eee5f33287be19ae372 Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 18 Dec 2014 23:27:10 +0100 Subject: VertexLoader: Add a test loader which compares two vertex loaders --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 60 ++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp') diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index 4372729506..ed56db0655 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include + #include "Common/StringUtil.h" #include "VideoCommon/VertexLoader.h" @@ -124,10 +126,68 @@ void VertexLoaderBase::AppendToString(std::string *dest) const dest->append(StringFromFormat(" - %i v\n", m_numLoadedVertices)); } +// a hacky implementation to compare two vertex loaders +class VertexLoaderTester : public VertexLoaderBase +{ +public: + VertexLoaderTester(VertexLoaderBase* _a, VertexLoaderBase* _b, const TVtxDesc& vtx_desc, const VAT& vtx_attr) + : VertexLoaderBase(vtx_desc, vtx_attr) + { + a = _a; + b = _b; + m_initialized = a && b && a->IsInitialized() && b->IsInitialized(); + m_initialized = m_initialized && (a->m_VertexSize == b->m_VertexSize); + m_initialized = m_initialized && (a->m_native_vtx_decl.stride == b->m_native_vtx_decl.stride); + } + ~VertexLoaderTester() + { + delete a; + delete b; + } + + int RunVertices(int primitive, int count, DataReader src, DataReader dst) override + { + buffer_a.resize(count * a->m_native_vtx_decl.stride); + buffer_b.resize(count * b->m_native_vtx_decl.stride); + + int count_a = a->RunVertices(primitive, count, src, DataReader(buffer_a.data(), buffer_a.data()+buffer_a.size())); + int count_b = b->RunVertices(primitive, count, src, DataReader(buffer_b.data(), buffer_b.data()+buffer_b.size())); + + if (count_a != count_b) + ERROR_LOG(VIDEO, "Both vertexloaders have loaded a different amount of vertices."); + + if (memcmp(buffer_a.data(), buffer_b.data(), std::min(count_a, count_b))) + ERROR_LOG(VIDEO, "Both vertexloaders have loaded different data."); + + u8* dstptr; + dst.WritePointer(&dstptr); + memcpy(dstptr, buffer_a.data(), count_a); + return count_a; + } + std::string GetName() const override { return "CompareLoader"; } + bool IsInitialized() override { return m_initialized; } + +private: + VertexLoaderBase *a, *b; + bool m_initialized; + std::vector buffer_a, buffer_b; +}; + VertexLoaderBase* VertexLoaderBase::CreateVertexLoader(const TVtxDesc& vtx_desc, const VAT& vtx_attr) { VertexLoaderBase* loader; +#if 0 + // first try: Any new VertexLoader vs the old one + loader = new VertexLoaderTester( + new VertexLoader(vtx_desc, vtx_attr), // the software one + new VertexLoader(vtx_desc, vtx_attr), // the new one to compare + vtx_desc, vtx_attr); + if (loader->IsInitialized()) + return loader; + delete loader; +#endif + // last try: The old VertexLoader loader = new VertexLoader(vtx_desc, vtx_attr); if (loader->IsInitialized()) -- cgit v1.2.3 From 2cedc0034def0d8e8b23fafceca9a0f87bdd2e63 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Tue, 6 Jan 2015 17:49:27 +0100 Subject: DataReader: turn WritePointer into GetPointer --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp') diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index ed56db0655..580fb5bf15 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -159,9 +159,7 @@ public: if (memcmp(buffer_a.data(), buffer_b.data(), std::min(count_a, count_b))) ERROR_LOG(VIDEO, "Both vertexloaders have loaded different data."); - u8* dstptr; - dst.WritePointer(&dstptr); - memcpy(dstptr, buffer_a.data(), count_a); + memcpy(dst.GetPointer(), buffer_a.data(), count_a); return count_a; } std::string GetName() const override { return "CompareLoader"; } -- cgit v1.2.3 From b0df4b08ec4638c3b55b6a620fa19d755168c07b Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 11 Jan 2015 16:20:44 +0100 Subject: VertexLoaderTester: fix a few problems --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 47 +++++++++++++++++++++------- 1 file changed, 35 insertions(+), 12 deletions(-) (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp') diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index 580fb5bf15..fd3f186a45 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include #include #include "Common/StringUtil.h" @@ -131,15 +132,34 @@ class VertexLoaderTester : public VertexLoaderBase { public: VertexLoaderTester(VertexLoaderBase* _a, VertexLoaderBase* _b, const TVtxDesc& vtx_desc, const VAT& vtx_attr) - : VertexLoaderBase(vtx_desc, vtx_attr) + : VertexLoaderBase(vtx_desc, vtx_attr), a(_a), b(_b) { - a = _a; - b = _b; m_initialized = a && b && a->IsInitialized() && b->IsInitialized(); - m_initialized = m_initialized && (a->m_VertexSize == b->m_VertexSize); - m_initialized = m_initialized && (a->m_native_vtx_decl.stride == b->m_native_vtx_decl.stride); + bool can_test = a->m_VertexSize == b->m_VertexSize && + a->m_native_components == b->m_native_components && + a->m_native_vtx_decl.stride == b->m_native_vtx_decl.stride; + + if (m_initialized) + { + if (can_test) + { + m_VertexSize = a->m_VertexSize; + m_native_components = a->m_native_components; + memcpy(&m_native_vtx_decl, &a->m_native_vtx_decl, sizeof(PortableVertexDeclaration)); + } + else + { + ERROR_LOG(VIDEO, "Can't compare vertex loaders that expect different vertex formats!"); + ERROR_LOG(VIDEO, "a: m_VertexSize %d, m_native_components 0x%08x, stride %d\n", + a->m_VertexSize, a->m_native_components, a->m_native_vtx_decl.stride); + ERROR_LOG(VIDEO, "b: m_VertexSize %d, m_native_components 0x%08x, stride %d\n", + b->m_VertexSize, b->m_native_components, b->m_native_vtx_decl.stride); + } + } + + m_initialized &= can_test; } - ~VertexLoaderTester() + ~VertexLoaderTester() override { delete a; delete b; @@ -147,19 +167,22 @@ public: int RunVertices(int primitive, int count, DataReader src, DataReader dst) override { - buffer_a.resize(count * a->m_native_vtx_decl.stride); - buffer_b.resize(count * b->m_native_vtx_decl.stride); + buffer_a.resize(count * a->m_native_vtx_decl.stride + 4); + buffer_b.resize(count * b->m_native_vtx_decl.stride + 4); int count_a = a->RunVertices(primitive, count, src, DataReader(buffer_a.data(), buffer_a.data()+buffer_a.size())); int count_b = b->RunVertices(primitive, count, src, DataReader(buffer_b.data(), buffer_b.data()+buffer_b.size())); if (count_a != count_b) - ERROR_LOG(VIDEO, "Both vertexloaders have loaded a different amount of vertices."); + ERROR_LOG(VIDEO, "The two vertex loaders have loaded a different amount of vertices (a: %d, b: %d).", count_a, count_b); - if (memcmp(buffer_a.data(), buffer_b.data(), std::min(count_a, count_b))) - ERROR_LOG(VIDEO, "Both vertexloaders have loaded different data."); + if (memcmp(buffer_a.data(), buffer_b.data(), std::min(count_a, count_b) * m_native_vtx_decl.stride)) + ERROR_LOG(VIDEO, "The two vertex loaders have loaded different data " + "(guru meditation 0x%016" PRIx64 ", 0x%08x, 0x%08x, 0x%08x).", + m_VtxDesc.Hex, m_vat.g0.Hex, m_vat.g1.Hex, m_vat.g2.Hex); - memcpy(dst.GetPointer(), buffer_a.data(), count_a); + memcpy(dst.GetPointer(), buffer_a.data(), count_a * m_native_vtx_decl.stride); + m_numLoadedVertices += count; return count_a; } std::string GetName() const override { return "CompareLoader"; } -- cgit v1.2.3 From e82e9f97f5ce2d73d2c8168c7a11504925fd4085 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Thu, 15 Jan 2015 01:46:23 +0100 Subject: VertexLoader: add new JIT --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp') diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index fd3f186a45..815e162689 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -10,11 +10,17 @@ #include "VideoCommon/VertexLoader.h" #include "VideoCommon/VertexLoaderBase.h" +#ifdef _M_X86_64 +#include "VideoCommon/VertexLoaderX64.h" +#endif + VertexLoaderBase::VertexLoaderBase(const TVtxDesc &vtx_desc, const VAT &vtx_attr) { m_numLoadedVertices = 0; m_VertexSize = 0; m_native_vertex_format = nullptr; + m_native_components = 0; + memset(&m_native_vtx_decl, 0, sizeof(m_native_vtx_decl)); SetVAT(vtx_attr); m_VtxDesc = vtx_desc; @@ -198,15 +204,22 @@ VertexLoaderBase* VertexLoaderBase::CreateVertexLoader(const TVtxDesc& vtx_desc, { VertexLoaderBase* loader; -#if 0 +//#define COMPARE_VERTEXLOADERS + +#if defined(COMPARE_VERTEXLOADERS) && defined(_M_X86_64) // first try: Any new VertexLoader vs the old one loader = new VertexLoaderTester( new VertexLoader(vtx_desc, vtx_attr), // the software one - new VertexLoader(vtx_desc, vtx_attr), // the new one to compare + new VertexLoaderX64(vtx_desc, vtx_attr), // the new one to compare vtx_desc, vtx_attr); if (loader->IsInitialized()) return loader; delete loader; +#elif defined(_M_X86_64) + loader = new VertexLoaderX64(vtx_desc, vtx_attr); + if (loader->IsInitialized()) + return loader; + delete loader; #endif // last try: The old VertexLoader -- cgit v1.2.3 From 1dcf49237b81b850d5683887e3608fbab8c54b27 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Tue, 20 Jan 2015 02:12:03 +0100 Subject: VertexLoaderX64: support VAT.ByteDequant=0 --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp') diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index 815e162689..c0e8e533df 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -66,11 +66,6 @@ void VertexLoaderBase::SetVAT(const VAT& vat) m_VtxAttr.texCoord[7].Elements = vat.g2.Tex7CoordElements; m_VtxAttr.texCoord[7].Format = vat.g2.Tex7CoordFormat; m_VtxAttr.texCoord[7].Frac = vat.g2.Tex7Frac; - - if (!m_VtxAttr.ByteDequant) - { - ERROR_LOG(VIDEO, "ByteDequant is set to zero"); - } }; void VertexLoaderBase::AppendToString(std::string *dest) const -- cgit v1.2.3 From 8416a86b6deceab44f4ebb446838976d53637149 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sat, 24 Jan 2015 18:45:56 +0100 Subject: VertexLoaderBase: fix crash on invalid formats --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp') diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index c0e8e533df..b17731509d 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -77,22 +77,15 @@ void VertexLoaderBase::AppendToString(std::string *dest) const static const char *posMode[4] = { "Inv", - "Dir", - "I8", - "I16", + "Dir", "I8", "I16", }; - static const char *posFormats[5] = { + static const char *posFormats[8] = { "u8", "s8", "u16", "s16", "flt", + "Inv", "Inv", "Inv", }; static const char *colorFormat[8] = { - "565", - "888", - "888x", - "4444", - "6666", - "8888", - "Inv", - "Inv", + "565", "888", "888x", "4444", "6666", "8888", + "Inv", "Inv", }; dest->append(StringFromFormat("%ib skin: %i P: %i %s-%s ", -- cgit v1.2.3 From 15e41c67f8fdb527af3267790154538454412596 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 12 Feb 2015 18:50:10 -0600 Subject: Change RunVertices' function arguments. This reduces some dumb state shuffling when calling the emitted vertex loaders. --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp') diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index b17731509d..c8ab14fb3b 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -159,13 +159,13 @@ public: delete b; } - int RunVertices(int primitive, int count, DataReader src, DataReader dst) override + int RunVertices(DataReader src, DataReader dst, int count, int primitive) override { buffer_a.resize(count * a->m_native_vtx_decl.stride + 4); buffer_b.resize(count * b->m_native_vtx_decl.stride + 4); - int count_a = a->RunVertices(primitive, count, src, DataReader(buffer_a.data(), buffer_a.data()+buffer_a.size())); - int count_b = b->RunVertices(primitive, count, src, DataReader(buffer_b.data(), buffer_b.data()+buffer_b.size())); + int count_a = a->RunVertices(src, DataReader(buffer_a.data(), buffer_a.data()+buffer_a.size()), count, primitive); + int count_b = b->RunVertices(src, DataReader(buffer_b.data(), buffer_b.data()+buffer_b.size()), count, primitive); if (count_a != count_b) ERROR_LOG(VIDEO, "The two vertex loaders have loaded a different amount of vertices (a: %d, b: %d).", count_a, count_b); -- cgit v1.2.3 From b4b03641b3edd060bcb8ba8d8f99fb65ab38c08e Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 12 Feb 2015 18:52:07 -0600 Subject: [AArch64] Implement vertex loader recompiler. Shows a noticeable reduction in time spent in the vertex loader. --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp') diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index c8ab14fb3b..924a51fc61 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -12,6 +12,8 @@ #ifdef _M_X86_64 #include "VideoCommon/VertexLoaderX64.h" +#elif defined(_M_ARM_64) +#include "VideoCommon/VertexLoaderARM64.h" #endif VertexLoaderBase::VertexLoaderBase(const TVtxDesc &vtx_desc, const VAT &vtx_attr) @@ -208,6 +210,11 @@ VertexLoaderBase* VertexLoaderBase::CreateVertexLoader(const TVtxDesc& vtx_desc, if (loader->IsInitialized()) return loader; delete loader; +#elif defined(_M_ARM_64) + loader = new VertexLoaderARM64(vtx_desc, vtx_attr); + if (loader->IsInitialized()) + return loader; + delete loader; #endif // last try: The old VertexLoader -- cgit v1.2.3 From 93b16a4a2d5f3e6d467d1315c461aff12852b26c Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Sun, 15 Feb 2015 14:43:31 -0500 Subject: Formatting/Whitespace Cleanup Various fixes to formatting and whitespace --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp') diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index 924a51fc61..9089ee67af 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -100,7 +100,7 @@ void VertexLoaderBase::AppendToString(std::string *dest) const m_VtxAttr.NormalElements, posMode[m_VtxDesc.Normal], posFormats[m_VtxAttr.NormalFormat])); } - u64 color_mode[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1}; + u64 color_mode[2] = { m_VtxDesc.Color0, m_VtxDesc.Color1 }; for (int i = 0; i < 2; i++) { if (color_mode[i]) -- cgit v1.2.3 From 6b2a1e57e2482efb46a91401fa22aaf5ef779974 Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 6 Apr 2015 11:44:13 +0200 Subject: BBox: remove now unreachable SW bbox implementation --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp') diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index 9089ee67af..94ba4f2728 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -161,13 +161,13 @@ public: delete b; } - int RunVertices(DataReader src, DataReader dst, int count, int primitive) override + int RunVertices(DataReader src, DataReader dst, int count) override { buffer_a.resize(count * a->m_native_vtx_decl.stride + 4); buffer_b.resize(count * b->m_native_vtx_decl.stride + 4); - int count_a = a->RunVertices(src, DataReader(buffer_a.data(), buffer_a.data()+buffer_a.size()), count, primitive); - int count_b = b->RunVertices(src, DataReader(buffer_b.data(), buffer_b.data()+buffer_b.size()), count, primitive); + int count_a = a->RunVertices(src, DataReader(buffer_a.data(), buffer_a.data()+buffer_a.size()), count); + int count_b = b->RunVertices(src, DataReader(buffer_b.data(), buffer_b.data()+buffer_b.size()), count); if (count_a != count_b) ERROR_LOG(VIDEO, "The two vertex loaders have loaded a different amount of vertices (a: %d, b: %d).", count_a, count_b); -- cgit v1.2.3 From cefcb0ace9d363b3679b4e93bcc9ec05f1e5f4f8 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Mon, 18 May 2015 01:08:10 +0200 Subject: Update license headers to GPLv2+ --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/VertexLoaderBase.cpp') diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index 9089ee67af..64bef30928 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -1,5 +1,5 @@ // Copyright 2014 Dolphin Emulator Project -// Licensed under GPLv2 +// Licensed under GPLv2+ // Refer to the license.txt file included. #include -- cgit v1.2.3