arm64 : fix intptr_t size

This commit is contained in:
hymei
2022-06-05 01:12:32 +03:00
committed by nillerusr
parent 2690e6c85a
commit 4e4039d756
143 changed files with 1015 additions and 674 deletions
+1 -1
View File
@@ -463,7 +463,7 @@ float AABBDistance( const Vector &mins0, const Vector &maxs0, const Vector &mins
class CLeafList : public ISpatialLeafEnumerator
{
public:
virtual bool EnumerateLeaf( int leaf, int context )
virtual bool EnumerateLeaf( int leaf, intp context )
{
m_list.AddToTail(leaf);
return true;
+2 -2
View File
@@ -361,7 +361,7 @@ public:
CLightSurface(int iThread) : m_pSurface(0), m_HitFrac(1.0f), m_bHasLuxel(false), m_iThread(iThread) {}
// call back with a node and a context
bool EnumerateNode( int node, Ray_t const& ray, float f, int context )
bool EnumerateNode( int node, Ray_t const& ray, float f, intp context )
{
dface_t* pSkySurface = 0;
@@ -410,7 +410,7 @@ public:
}
// call back with a leaf and a context
virtual bool EnumerateLeaf( int leaf, Ray_t const& ray, float start, float end, int context )
virtual bool EnumerateLeaf( int leaf, Ray_t const& ray, float start, float end, intp context )
{
bool hit = false;
dleaf_t* pLeaf = &dleafs[leaf];
+17 -17
View File
@@ -41,10 +41,10 @@ public:
}
// ISpatialLeafEnumerator
bool EnumerateLeaf( int ndxLeaf, int context );
bool EnumerateLeaf( int ndxLeaf, intp context );
// IBSPTreeDataEnumerator
bool FASTCALL EnumerateElement( int userId, int context );
bool FASTCALL EnumerateElement( int userId, intp context );
public:
@@ -61,10 +61,10 @@ class CBSPDispRayEnumerator : public ISpatialLeafEnumerator, public IBSPTreeData
{
public:
// ISpatialLeafEnumerator
bool EnumerateLeaf( int ndxLeaf, int context );
bool EnumerateLeaf( int ndxLeaf, intp context );
// IBSPTreeDataEnumerator
bool FASTCALL EnumerateElement( int userId, int context );
bool FASTCALL EnumerateElement( int userId, intp context );
};
//=============================================================================
@@ -127,12 +127,12 @@ public:
//
// Enumeration Methods
//
bool DispRay_EnumerateLeaf( int ndxLeaf, int context );
bool DispRay_EnumerateElement( int userId, int context );
bool DispRay_EnumerateLeaf( int ndxLeaf, intp context );
bool DispRay_EnumerateElement( int userId, intp context );
bool DispRayDistance_EnumerateElement( int userId, CBSPDispRayDistanceEnumerator* pEnum );
bool DispFaceList_EnumerateLeaf( int ndxLeaf, int context );
bool DispFaceList_EnumerateElement( int userId, int context );
bool DispFaceList_EnumerateLeaf( int ndxLeaf, intp context );
bool DispFaceList_EnumerateElement( int userId, intp context );
private:
@@ -215,13 +215,13 @@ IVRadDispMgr *StaticDispMgr( void )
// Displacement/Face List
//
// ISpatialLeafEnumerator
bool CBSPDispFaceListEnumerator::EnumerateLeaf( int ndxLeaf, int context )
bool CBSPDispFaceListEnumerator::EnumerateLeaf( int ndxLeaf, intp context )
{
return s_DispMgr.DispFaceList_EnumerateLeaf( ndxLeaf, context );
}
// IBSPTreeDataEnumerator
bool FASTCALL CBSPDispFaceListEnumerator::EnumerateElement( int userId, int context )
bool FASTCALL CBSPDispFaceListEnumerator::EnumerateElement( int userId, intp context )
{
return s_DispMgr.DispFaceList_EnumerateElement( userId, context );
}
@@ -231,12 +231,12 @@ bool FASTCALL CBSPDispFaceListEnumerator::EnumerateElement( int userId, int cont
//
// RayEnumerator
//
bool CBSPDispRayEnumerator::EnumerateLeaf( int ndxLeaf, int context )
bool CBSPDispRayEnumerator::EnumerateLeaf( int ndxLeaf, intp context )
{
return s_DispMgr.DispRay_EnumerateLeaf( ndxLeaf, context );
}
bool FASTCALL CBSPDispRayEnumerator::EnumerateElement( int userId, int context )
bool FASTCALL CBSPDispRayEnumerator::EnumerateElement( int userId, intp context )
{
return s_DispMgr.DispRay_EnumerateElement( userId, context );
}
@@ -252,7 +252,7 @@ public:
CBSPDispRayDistanceEnumerator() : m_Distance(1.0f), m_pSurface(0) {}
// IBSPTreeDataEnumerator
bool FASTCALL EnumerateElement( int userId, int context )
bool FASTCALL EnumerateElement( int userId, intp context )
{
return s_DispMgr.DispRayDistance_EnumerateElement( userId, this );
}
@@ -669,7 +669,7 @@ void CVRadDispMgr::GetDispSurf( int ndxFace, CVRADDispColl **ppDispTree )
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
bool CVRadDispMgr::DispRay_EnumerateLeaf( int ndxLeaf, int context )
bool CVRadDispMgr::DispRay_EnumerateLeaf( int ndxLeaf, intp context )
{
return m_pBSPTreeData->EnumerateElementsInLeaf( ndxLeaf, &m_EnumDispRay, context );
}
@@ -677,7 +677,7 @@ bool CVRadDispMgr::DispRay_EnumerateLeaf( int ndxLeaf, int context )
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
bool CVRadDispMgr::DispRay_EnumerateElement( int userId, int context )
bool CVRadDispMgr::DispRay_EnumerateElement( int userId, intp context )
{
DispCollTree_t &dispTree = m_DispTrees[userId];
EnumContext_t *pCtx = ( EnumContext_t* )context;
@@ -766,7 +766,7 @@ float CVRadDispMgr::ClipRayToDisp( Ray_t const &ray, int dispinfo )
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
bool CVRadDispMgr::DispFaceList_EnumerateLeaf( int ndxLeaf, int context )
bool CVRadDispMgr::DispFaceList_EnumerateLeaf( int ndxLeaf, intp context )
{
//
// add the faces found in this leaf to the face list
@@ -799,7 +799,7 @@ bool CVRadDispMgr::DispFaceList_EnumerateLeaf( int ndxLeaf, int context )
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
bool CVRadDispMgr::DispFaceList_EnumerateElement( int userId, int context )
bool CVRadDispMgr::DispFaceList_EnumerateElement( int userId, intp context )
{
DispCollTree_t &dispTree = m_DispTrees[userId];
CVRADDispColl *pDispTree = dispTree.m_pDispTree;