celisej567/BCWSsrc
1
0
Fork 0
mirror of https://github.com/celisej567/BCWSsrc.git synced 2026-09-21 20:15:08 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix gcc 8.2 build errors

Browse Source
This commit is contained in:
Alexander 'z33ky' Hirsch
2019-09-27 10:21:22 +02:00
parent 2c60bd368d
commit 77fada1ca2
7 changed files with 1131 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sp/src/public/particles/particles.h
View File

@@ -1375,7 +1375,7 @@ private:
class CM128InitialAttributeIterator : public CStridedConstPtr<fltx4>
class CM128InitialAttributeIterator : public CFltx4StridedConstPtr
{
public:
FORCEINLINE CM128InitialAttributeIterator( int nAttribute, CParticleCollection *pParticles )
@@ -1385,7 +1385,7 @@ public:
};
class CM128AttributeIterator : public CStridedConstPtr<fltx4>
class CM128AttributeIterator : public CFltx4StridedConstPtr
{
public:
FORCEINLINE CM128AttributeIterator( int nAttribute, CParticleCollection *pParticles )
@@ -1403,7 +1403,7 @@ public:
}
};
class CM128AttributeWriteIterator : public CStridedPtr<fltx4>
class CM128AttributeWriteIterator : public CFltx4StridedPtr
{
public:
FORCEINLINE CM128AttributeWriteIterator( void )

8
sp/src/public/tier1/utlblockmemory.h
View File

@@ -135,10 +135,10 @@ CUtlBlockMemory<T,I>::~CUtlBlockMemory()
template< class T, class I >
void CUtlBlockMemory<T,I>::Swap( CUtlBlockMemory< T, I > &mem )
{
swap( m_pMemory, mem.m_pMemory );
swap( m_nBlocks, mem.m_nBlocks );
swap( m_nIndexMask, mem.m_nIndexMask );
swap( m_nIndexShift, mem.m_nIndexShift );
V_swap( m_pMemory, mem.m_pMemory );
V_swap( m_nBlocks, mem.m_nBlocks );
V_swap( m_nIndexMask, mem.m_nIndexMask );
V_swap( m_nIndexShift, mem.m_nIndexShift );
}

97
sp/src/public/tier1/utlsoacontainer.h
View File

@@ -109,6 +109,95 @@ public:
}
};
class CFltx4StridedPtr
{
private:
typedef __m128 T;
protected:
T *m_pData;
size_t m_nStride;
public:
FORCEINLINE CFltx4StridedPtr( void *pData, size_t nByteStride )
{
m_pData = reinterpret_cast<T *>( pData );
m_nStride = nByteStride / sizeof( T );
}
FORCEINLINE CFltx4StridedPtr( void ) {}
T *operator->(void) const
{
return m_pData;
}
T & operator*(void) const
{
return *m_pData;
}
FORCEINLINE operator T *(void)
{
return m_pData;
}
FORCEINLINE CFltx4StridedPtr& operator++(void)
{
m_pData += m_nStride;
return *this;
}
FORCEINLINE void operator+=( size_t nNumElements )
{
m_pData += nNumElements * m_nStride;
}
};
class CFltx4StridedConstPtr
{
private:
typedef __m128 T;
protected:
const T *m_pData;
size_t m_nStride;
public:
FORCEINLINE CFltx4StridedConstPtr( void const *pData, size_t nByteStride )
{
m_pData = reinterpret_cast<T const *>( pData );
m_nStride = nByteStride / sizeof( T );
}
FORCEINLINE CFltx4StridedConstPtr( void ) {}
const T *operator->(void) const
{
return m_pData;
}
const T & operator*(void) const
{
return *m_pData;
}
FORCEINLINE operator const T *(void) const
{
return m_pData;
}
FORCEINLINE CFltx4StridedConstPtr &operator++(void)
{
m_pData += m_nStride;
return *this;
}
FORCEINLINE void operator+=( size_t nNumElements )
{
m_pData += nNumElements*m_nStride;
}
};
// allowed field data types. if you change these values, you need to change the tables in the .cpp file
enum EAttributeDataType
{
@@ -311,19 +400,19 @@ public:
};
class CFltX4AttributeIterator : public CStridedConstPtr<fltx4>
class CFltX4AttributeIterator : public CFltx4StridedConstPtr
{
FORCEINLINE CFltX4AttributeIterator( CSOAContainer const *pContainer, int nAttribute, int nRowNumber = 0 )
: CStridedConstPtr<fltx4>( pContainer->ConstRowPtr( nAttribute, nRowNumber),
: CFltx4StridedConstPtr( pContainer->ConstRowPtr( nAttribute, nRowNumber),
pContainer->ItemByteStride( nAttribute ) )
{
}
};
class CFltX4AttributeWriteIterator : public CStridedPtr<fltx4>
class CFltX4AttributeWriteIterator : public CFltx4StridedPtr
{
FORCEINLINE CFltX4AttributeWriteIterator( CSOAContainer const *pContainer, int nAttribute, int nRowNumber = 0 )
: CStridedPtr<fltx4>( pContainer->RowPtr( nAttribute, nRowNumber),
: CFltx4StridedPtr( pContainer->RowPtr( nAttribute, nRowNumber),
pContainer->ItemByteStride( nAttribute ) )
{
}