Delete reimplemented code

Author: kevyuu

src/nbl/asset/utils/CPolygonGeometryManipulator.cpp

@@ -584,190 +584,6 @@ core::smart_refctd_ptr<ICPUMeshBuffer> IMeshManipulator::calculateSmoothNormals(
 	return outbuffer;
 }
 
-// Used by createMeshBufferWelded only
-static bool cmpVertices(ICPUMeshBuffer* _inbuf, const void* _va, const void* _vb, size_t _vsize, const IMeshManipulator::SErrorMetric* _errMetrics)
-{
-    auto cmpInteger = [](uint32_t* _a, uint32_t* _b, size_t _n) -> bool {
-        return !memcmp(_a, _b, _n*4);
-    };
-
-    constexpr uint32_t MAX_ATTRIBS = ICPUMeshBuffer::MAX_VERTEX_ATTRIB_COUNT;
-
-    const uint8_t* va = reinterpret_cast<const uint8_t*>(_va), *vb = reinterpret_cast<const uint8_t*>(_vb);
-    for (size_t i = 0u; i < MAX_ATTRIBS; ++i)
-    {
-        if (!_inbuf->isAttributeEnabled(i))
-            continue;
-
-        const auto atype = _inbuf->getAttribFormat(i);
-        const auto cpa = getFormatChannelCount(atype);
-
-        if (isIntegerFormat(atype) || isScaledFormat(atype))
-        {
-            uint32_t attr[8];
-            ICPUMeshBuffer::getAttribute(attr, va, atype);
-            ICPUMeshBuffer::getAttribute(attr+4, vb, atype);
-            if (!cmpInteger(attr, attr+4, cpa))
-                return false;
-        }
-        else
-        {
-            core::vectorSIMDf attr[2];
-            ICPUMeshBuffer::getAttribute(attr[0], va, atype);
-            ICPUMeshBuffer::getAttribute(attr[1], vb, atype);
-            if (!IMeshManipulator::compareFloatingPointAttribute(attr[0], attr[1], cpa, _errMetrics[i]))
-                return false;
-        }
-
-        const uint32_t sz = getTexelOrBlockBytesize(atype);
-        va += sz;
-        vb += sz;
-    }
-
-    return true;
-}
-
-//! Creates a copy of a mesh, which will have identical vertices welded together
-core::smart_refctd_ptr<ICPUMeshBuffer> IMeshManipulator::createMeshBufferWelded(ICPUMeshBuffer *inbuffer, const SErrorMetric* _errMetrics, const bool& optimIndexType, const bool& makeNewMesh)
-{
-    if (!inbuffer || !inbuffer->getPipeline())
-        return nullptr;
-
-    constexpr uint32_t MAX_ATTRIBS = ICPUMeshBuffer::MAX_VERTEX_ATTRIB_COUNT;
-
-    bool bufferPresent[MAX_ATTRIBS];
-
-    size_t vertexAttrSize[MAX_ATTRIBS];
-    size_t vertexSize = 0;
-    for (size_t i=0; i<MAX_ATTRIBS; i++)
-    {
-        const auto& buf = inbuffer->getAttribBoundBuffer(i).buffer;
-        bufferPresent[i] = inbuffer->isAttributeEnabled(i);
-        if (bufferPresent[i] && buf)
-        {
-            const E_FORMAT componentType = inbuffer->getAttribFormat(i);
-            vertexAttrSize[i] = getTexelOrBlockBytesize(componentType);
-            vertexSize += vertexAttrSize[i];
-        }
-    }
-
-    auto cmpfunc = [&, inbuffer, vertexSize, _errMetrics](const void* _va, const void* _vb) {
-        return cmpVertices(inbuffer, _va, _vb, vertexSize, _errMetrics);
-    };
-
-    const uint32_t vertexCount = IMeshManipulator::upperBoundVertexID(inbuffer);
-    const E_INDEX_TYPE oldIndexType = inbuffer->getIndexType();
-
-    if (!vertexCount)
-        return nullptr;
-
-    // reset redirect list
-    uint32_t* redirects = new uint32_t[vertexCount];
-
-    uint32_t maxRedirect = 0;
-
-    uint8_t* epicData = reinterpret_cast<uint8_t*>(_NBL_ALIGNED_MALLOC(vertexSize*vertexCount,_NBL_SIMD_ALIGNMENT));
-    for (auto i=0u; i<vertexCount; i++)
-    {
-        uint8_t* currentVertexPtr = epicData+i*vertexSize;
-        for (size_t k=0; k<MAX_ATTRIBS; k++)
-        {
-            if (!bufferPresent[k])
-                continue;
-
-            size_t stride = inbuffer->getAttribStride(k);
-            uint8_t* sourcePtr = inbuffer->getAttribPointer(k) + i*stride;
-            memcpy(currentVertexPtr,sourcePtr,vertexAttrSize[k]);
-            currentVertexPtr += vertexAttrSize[k];
-        }
-    }
-
-    for (auto i=0u; i<vertexCount; i++)
-    {
-        uint32_t redir = i;
-        for (auto j=0u; j<vertexCount; ++j) // TODO: Use spatial hash for this like in the smooth normal computation @Przemog
-        {
-            if (i == j)
-                continue;
-            if (cmpfunc(epicData+vertexSize*i, epicData+vertexSize*j))
-            {
-                redir = j;
-                break;
-            }
-        }
-
-        redirects[i] = redir;
-        if (redir>maxRedirect)
-            maxRedirect = redir;
-    }
-    _NBL_ALIGNED_FREE(epicData);
-
-    void* oldIndices = inbuffer->getIndices();
-    core::smart_refctd_ptr<ICPUMeshBuffer> clone;
-    if (makeNewMesh)
-        clone = core::smart_refctd_ptr_static_cast<ICPUMeshBuffer>(inbuffer->clone(0u));
-    else
-    {
-        if (!oldIndices)
-        {
-            inbuffer->setIndexBufferBinding({ 0u, ICPUBuffer::create({ (maxRedirect >= 0x10000u ? sizeof(uint32_t) : sizeof(uint16_t)) * inbuffer->getIndexCount() }) });
-            inbuffer->setIndexType(maxRedirect>=0x10000u ? EIT_32BIT:EIT_16BIT);
-        }
-    }
-
-    // TODO: reduce the code duplication via the use of a generic lambda (with a `auto*`)
-    if (oldIndexType==EIT_16BIT)
-    {
-        uint16_t* indicesIn = reinterpret_cast<uint16_t*>(oldIndices);
-        if ((makeNewMesh ? clone.get():inbuffer)->getIndexType()==EIT_32BIT)
-        {
-            uint32_t* indicesOut = reinterpret_cast<uint32_t*>((makeNewMesh ? clone.get():inbuffer)->getIndices());
-            for (size_t i=0; i<inbuffer->getIndexCount(); i++)
-                indicesOut[i] = redirects[indicesIn[i]];
-        }
-        else if ((makeNewMesh ? clone.get():inbuffer)->getIndexType()==EIT_16BIT)
-        {
-            uint16_t* indicesOut = reinterpret_cast<uint16_t*>((makeNewMesh ? clone.get():inbuffer)->getIndices());
-            for (size_t i=0; i<inbuffer->getIndexCount(); i++)
-                indicesOut[i] = redirects[indicesIn[i]];
-        }
-    }
-    else if (oldIndexType==EIT_32BIT)
-    {
-        uint32_t* indicesIn = reinterpret_cast<uint32_t*>(oldIndices);
-        if ((makeNewMesh ? clone.get():inbuffer)->getIndexType()==EIT_32BIT)
-        {
-            uint32_t* indicesOut = reinterpret_cast<uint32_t*>((makeNewMesh ? clone.get():inbuffer)->getIndices());
-            for (size_t i=0; i<inbuffer->getIndexCount(); i++)
-                indicesOut[i] = redirects[indicesIn[i]];
-        }
-        else if ((makeNewMesh ? clone.get():inbuffer)->getIndexType()==EIT_16BIT)
-        {
-            uint16_t* indicesOut = reinterpret_cast<uint16_t*>((makeNewMesh ? clone.get():inbuffer)->getIndices());
-            for (size_t i=0; i<inbuffer->getIndexCount(); i++)
-                indicesOut[i] = redirects[indicesIn[i]];
-        }
-    }
-    else if ((makeNewMesh ? clone.get():inbuffer)->getIndexType()==EIT_32BIT)
-    {
-        uint32_t* indicesOut = reinterpret_cast<uint32_t*>((makeNewMesh ? clone.get():inbuffer)->getIndices());
-        for (size_t i=0; i<inbuffer->getIndexCount(); i++)
-            indicesOut[i] = redirects[i];
-    }
-    else if ((makeNewMesh ? clone.get():inbuffer)->getIndexType()==EIT_16BIT)
-    {
-        uint16_t* indicesOut = reinterpret_cast<uint16_t*>((makeNewMesh ? clone.get():inbuffer)->getIndices());
-        for (size_t i=0; i<inbuffer->getIndexCount(); i++)
-            indicesOut[i] = redirects[i];
-    }
-    delete [] redirects;
-
-    if (makeNewMesh)
-        return clone;
-    else
-        return core::smart_refctd_ptr<ICPUMeshBuffer>(inbuffer);
-}
-
 core::smart_refctd_ptr<ICPUMeshBuffer> IMeshManipulator::createOptimizedMeshBuffer(const ICPUMeshBuffer* _inbuffer, const SErrorMetric* _errMetric)
 {
 	if (!_inbuffer)