Skip to content

Commit 33ecdcb

Browse files
dimhotepusdimhotepus
committed
engine: FIx indexers on x86-64
1 parent 68f5ef1 commit 33ecdcb

1 file changed

Lines changed: 53 additions & 53 deletions

File tree

‎engine/Overlay.cpp‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class COverlayMgr : public IOverlayMgr
144144

145145
private:
146146
// Create, destroy material sort order ids...
147-
int GetMaterialSortID( IMaterial* pMaterial, int nLightmapPage );
147+
unsigned short GetMaterialSortID( IMaterial* pMaterial, int nLightmapPage );
148148
void CleanupMaterial( unsigned short nSortOrder );
149149

150150
moverlay_t *GetOverlay( int iOverlay );
@@ -165,7 +165,7 @@ class COverlayMgr : public IOverlayMgr
165165
float clipDistStart, int nInterval, int nLoopStart, int nLoopEnd, int nLoopInc );
166166

167167
// Utility
168-
OverlayFragmentHandle_t AddFragmentToFragmentList( int nSize );
168+
OverlayFragmentHandle_t AddFragmentToFragmentList( intp nSize );
169169
OverlayFragmentHandle_t AddFragmentToFragmentList( moverlayfragment_t *pSrc );
170170

171171
bool FadeOverlayFragmentGlobal( moverlayfragment_t *pFragment );
@@ -287,14 +287,14 @@ void COverlayMgr::UnloadOverlays( )
287287
m_RenderQueue[i].m_pMaterial->DecrementReferenceCount();
288288
}
289289

290-
int nOverlayCount = m_aOverlays.Count();
291-
for ( int iOverlay = 0; iOverlay < nOverlayCount; ++iOverlay )
290+
intp nOverlayCount = m_aOverlays.Count();
291+
for ( intp iOverlay = 0; iOverlay < nOverlayCount; ++iOverlay )
292292
{
293293
moverlay_t *pOverlay = &m_aOverlays.Element( iOverlay );
294-
int hFrag = pOverlay->m_hFirstFragment;
294+
OverlayFragmentList_t hFrag = pOverlay->m_hFirstFragment;
295295
while ( hFrag != OVERLAY_FRAGMENT_INVALID )
296296
{
297-
int iFrag = m_OverlayFragments[hFrag];
297+
auto iFrag = m_OverlayFragments[hFrag];
298298
m_aFragments.Free( iFrag );
299299
hFrag = m_OverlayFragments.Next( hFrag );
300300
}
@@ -315,7 +315,7 @@ void COverlayMgr::UnloadOverlays( )
315315
//-----------------------------------------------------------------------------
316316
// Create, destroy material sort order ids...
317317
//-----------------------------------------------------------------------------
318-
int COverlayMgr::GetMaterialSortID( IMaterial* pMaterial, int nLightmapPage )
318+
unsigned short COverlayMgr::GetMaterialSortID( IMaterial* pMaterial, int nLightmapPage )
319319
{
320320
// Search the sort order handles for an enumeration id match (means materials + lightmaps match)
321321
unsigned short i;
@@ -404,10 +404,10 @@ void COverlayMgr::ClearRenderLists()
404404
bool COverlayMgr::FadeOverlayFragmentGlobal( moverlayfragment_t *pFragment )
405405
{
406406
// Test the overlay distance and set alpha values.
407-
int iVert;
407+
intp iVert;
408408
bool bInRange = false;
409409

410-
int nVertexCount = pFragment->m_aPrimVerts.Count();
410+
intp nVertexCount = pFragment->m_aPrimVerts.Count();
411411
for ( iVert = 0; iVert < nVertexCount; ++iVert )
412412
{
413413
Vector vecSegment;
@@ -470,8 +470,8 @@ bool COverlayMgr::FadeOverlayFragment( moverlay_t *pOverlay, moverlayfragment_t
470470
}
471471
}
472472

473-
int nVertexCount = pFragment->m_aPrimVerts.Count();
474-
for ( int iVert = 0; iVert < nVertexCount; ++iVert )
473+
intp nVertexCount = pFragment->m_aPrimVerts.Count();
474+
for ( intp iVert = 0; iVert < nVertexCount; ++iVert )
475475
{
476476
pFragment->m_aPrimVerts.Element( iVert ).flAlpha = flAlpha;
477477
}
@@ -496,7 +496,7 @@ void COverlayMgr::AddFragmentListToRenderList( int nSortGroup, OverlayFragmentHa
496496
continue;
497497

498498
// Triangle count too low? Skip it...
499-
int nVertexCount = pFragment->m_aPrimVerts.Count();
499+
intp nVertexCount = pFragment->m_aPrimVerts.Count();
500500
if ( nVertexCount < 3 )
501501
continue;
502502

@@ -520,7 +520,7 @@ void COverlayMgr::AddFragmentListToRenderList( int nSortGroup, OverlayFragmentHa
520520
pFragment->m_nRenderFrameID = g_OverlayRenderFrameID;
521521

522522
// Determine the material associated with the fragment...
523-
int nMaterialSortID = pFragment->m_nMaterialSortID;
523+
auto nMaterialSortID = pFragment->m_nMaterialSortID;
524524

525525
// Insert the render queue into the list of render queues to render
526526
RenderQueueHead_t &renderQueue = m_RenderQueue[nMaterialSortID];
@@ -553,8 +553,8 @@ void COverlayMgr::AddFragmentListToRenderList( int nSortGroup, OverlayFragmentHa
553553
void COverlayMgr::ClearRenderLists( int nSortGroup )
554554
{
555555
g_OverlayRenderFrameID++;
556-
int nNextRenderQueue;
557-
for( int i = m_nFirstRenderQueue[nSortGroup]; i != RENDER_QUEUE_INVALID; i = nNextRenderQueue )
556+
unsigned short nNextRenderQueue;
557+
for( auto i = m_nFirstRenderQueue[nSortGroup]; i != RENDER_QUEUE_INVALID; i = nNextRenderQueue )
558558
{
559559
RenderQueueInfo_t &renderQueue = m_RenderQueue[i].m_Queue[nSortGroup];
560560
nNextRenderQueue = renderQueue.m_nNextRenderQueue;
@@ -600,8 +600,8 @@ void COverlayMgr::RenderOverlays( int nSortGroup )
600600
int nMaxIndices = pRenderContext->GetMaxIndicesToRender();
601601
while ( iCurrentRenderOrder <= iHighestRenderOrder )
602602
{
603-
int nNextRenderQueue;
604-
for( int i = m_nFirstRenderQueue[nSortGroup]; i != RENDER_QUEUE_INVALID; i = nNextRenderQueue )
603+
unsigned short nNextRenderQueue;
604+
for( unsigned short i = m_nFirstRenderQueue[nSortGroup]; i != RENDER_QUEUE_INVALID; i = nNextRenderQueue )
605605
{
606606
RenderQueueHead_t &renderQueueHead = m_RenderQueue[i];
607607
RenderQueueInfo_t &renderQueue = renderQueueHead.m_Queue[nSortGroup];
@@ -652,8 +652,8 @@ void COverlayMgr::RenderOverlays( int nSortGroup )
652652
if ( iThisOverlayRenderOrder != iCurrentRenderOrder )
653653
continue;
654654

655-
int nVertCount = pFragment->m_aPrimVerts.Count();
656-
int nIndexCount = 3 * ( nVertCount - 2 );
655+
intp nVertCount = pFragment->m_aPrimVerts.Count();
656+
intp nIndexCount = 3 * ( nVertCount - 2 );
657657

658658
if ( pMesh )
659659
{
@@ -766,8 +766,8 @@ bool COverlayMgr::Surf_PreClipFragment( moverlay_t *pOverlay, moverlayfragment_t
766766
InitTexCoords( pOverlay, overlayFrag );
767767

768768
// Surface
769-
int nVertCount = surfaceFrag.m_aPrimVerts.Count();
770-
for ( int iVert = 0; iVert < nVertCount; ++iVert )
769+
intp nVertCount = surfaceFrag.m_aPrimVerts.Count();
770+
for ( intp iVert = 0; iVert < nVertCount; ++iVert )
771771
{
772772
// Position.
773773
Overlay_WorldToOverlayPlane( pOverlay->m_vecOrigin, pOverlay->m_vecBasis[2],
@@ -784,7 +784,7 @@ void COverlayMgr::Surf_PostClipFragment( moverlay_t *pOverlay, moverlayfragment_
784784
{
785785
#ifndef SWDS
786786
// Get fragment vertex count.
787-
int nVertCount = overlayFrag.m_aPrimVerts.Count();
787+
intp nVertCount = overlayFrag.m_aPrimVerts.Count();
788788

789789
if ( nVertCount == 0 )
790790
return;
@@ -812,7 +812,7 @@ void COverlayMgr::Surf_PostClipFragment( moverlay_t *pOverlay, moverlayfragment_
812812
}
813813
InitTexCoords( pOverlay, origOverlay );
814814

815-
for ( int iVert = 0; iVert < nVertCount; ++iVert )
815+
for ( intp iVert = 0; iVert < nVertCount; ++iVert )
816816
{
817817
Vector2D vecUV;
818818
PointInQuadToBarycentric( origOverlay.m_aPrimVerts[0].pos,
@@ -982,11 +982,11 @@ void COverlayMgr::Surf_CreateFragments( moverlay_t *pOverlay, SurfaceHandle_t su
982982
//-----------------------------------------------------------------------------
983983
void COverlayMgr::CreateFragments( void )
984984
{
985-
int nOverlayCount = m_aOverlays.Count();
986-
for ( int iOverlay = 0; iOverlay < nOverlayCount; ++iOverlay )
985+
intp nOverlayCount = m_aOverlays.Count();
986+
for ( intp iOverlay = 0; iOverlay < nOverlayCount; ++iOverlay )
987987
{
988988
moverlay_t *pOverlay = &m_aOverlays.Element( iOverlay );
989-
int nFaceCount = pOverlay->m_aFaces.Count();
989+
intp nFaceCount = pOverlay->m_aFaces.Count();
990990
if ( nFaceCount == 0 )
991991
continue;
992992

@@ -996,7 +996,7 @@ void COverlayMgr::CreateFragments( void )
996996
Overlay_BuildBasis( pOverlay->m_vecBasis[2], pOverlay->m_vecBasis[0], pOverlay->m_vecBasis[1], bFlip );
997997

998998
// Clip against each face in the face list.
999-
for( int iFace = 0; iFace < nFaceCount; ++iFace )
999+
for( intp iFace = 0; iFace < nFaceCount; ++iFace )
10001000
{
10011001
SurfaceHandle_t surfID = pOverlay->m_aFaces[iFace];
10021002

@@ -1012,23 +1012,23 @@ void COverlayMgr::CreateFragments( void )
10121012
}
10131013

10141014
// Overlay checking!
1015-
for ( int iOverlay = 0; iOverlay < nOverlayCount; ++iOverlay )
1015+
for ( intp iOverlay = 0; iOverlay < nOverlayCount; ++iOverlay )
10161016
{
10171017
moverlay_t *pOverlay = &m_aOverlays.Element( iOverlay );
1018-
int hFrag = pOverlay->m_hFirstFragment;
1018+
OverlayFragmentList_t hFrag = pOverlay->m_hFirstFragment;
10191019
while ( hFrag != OVERLAY_FRAGMENT_INVALID )
10201020
{
1021-
int iFrag = m_OverlayFragments[hFrag];
1021+
unsigned short iFrag = m_OverlayFragments[hFrag];
10221022
moverlayfragment_t *pFrag = &m_aFragments[iFrag];
1023-
int nVertCount = pFrag->m_aPrimVerts.Count();
1024-
for ( int iVert = 0; iVert < nVertCount; ++iVert )
1023+
intp nVertCount = pFrag->m_aPrimVerts.Count();
1024+
for ( intp iVert = 0; iVert < nVertCount; ++iVert )
10251025
{
10261026
overlayvert_t *pVert = &pFrag->m_aPrimVerts[iVert];
10271027
if ( !pVert->pos.IsValid() )
10281028
{
10291029
Assert( 0 );
10301030
mtexinfo_t *pTexInfo = &host_state.worldbrush->texinfo[pOverlay->m_nTexInfo];
1031-
DevMsg( 1, "Bad overlay vert - %d at (%f, %f, %f) with material '%s'\n", iOverlay,
1031+
DevMsg( 1, "Bad overlay vert - %zd at (%f, %f, %f) with material '%s'\n", iOverlay,
10321032
pOverlay->m_vecOrigin.x, pOverlay->m_vecOrigin.y, pOverlay->m_vecOrigin.z,
10331033
pTexInfo->material ? pTexInfo->material->GetName() : "" );
10341034
}
@@ -1037,7 +1037,7 @@ void COverlayMgr::CreateFragments( void )
10371037
{
10381038
Assert( 0 );
10391039
mtexinfo_t *pTexInfo = &host_state.worldbrush->texinfo[pOverlay->m_nTexInfo];
1040-
DevMsg( 1, "Bad overlay normal - %d at (%f, %f, %f) with material '%s'\n", iOverlay,
1040+
DevMsg( 1, "Bad overlay normal - %zd at (%f, %f, %f) with material '%s'\n", iOverlay,
10411041
pOverlay->m_vecOrigin.x, pOverlay->m_vecOrigin.y, pOverlay->m_vecOrigin.z,
10421042
pTexInfo->material ? pTexInfo->material->GetName() : "" );
10431043
}
@@ -1046,7 +1046,7 @@ void COverlayMgr::CreateFragments( void )
10461046
{
10471047
Assert( 0 );
10481048
mtexinfo_t *pTexInfo = &host_state.worldbrush->texinfo[pOverlay->m_nTexInfo];
1049-
DevMsg( 1, "Bad overlay texture coords - %d at (%f, %f, %f) with material '%s'\n", iOverlay,
1049+
DevMsg( 1, "Bad overlay texture coords - %zd at (%f, %f, %f) with material '%s'\n", iOverlay,
10501050
pOverlay->m_vecOrigin.x, pOverlay->m_vecOrigin.y, pOverlay->m_vecOrigin.z,
10511051
pTexInfo->material ? pTexInfo->material->GetName() : "" );
10521052
}
@@ -1070,8 +1070,8 @@ void COverlayMgr::ReSortMaterials( void )
10701070
}
10711071

10721072
// Update all fragments.
1073-
int nOverlayCount = m_aOverlays.Count();
1074-
for ( int iOverlay = 0; iOverlay < nOverlayCount; ++iOverlay )
1073+
intp nOverlayCount = m_aOverlays.Count();
1074+
for ( intp iOverlay = 0; iOverlay < nOverlayCount; ++iOverlay )
10751075
{
10761076
moverlay_t *pOverlay = &m_aOverlays.Element( iOverlay );
10771077
if ( !pOverlay )
@@ -1081,10 +1081,10 @@ void COverlayMgr::ReSortMaterials( void )
10811081
if ( !pTexInfo )
10821082
continue;
10831083

1084-
int hFrag = pOverlay->m_hFirstFragment;
1084+
OverlayFragmentList_t hFrag = pOverlay->m_hFirstFragment;
10851085
while ( hFrag != OVERLAY_FRAGMENT_INVALID )
10861086
{
1087-
int iFrag = m_OverlayFragments[hFrag];
1087+
unsigned short iFrag = m_OverlayFragments[hFrag];
10881088
moverlayfragment_t *pFrag = &m_aFragments[iFrag];
10891089
{
10901090
const MaterialSystem_SortInfo_t &sortInfo = materialSortInfoArray[MSurf_MaterialSortID( pFrag->m_SurfId )];
@@ -1094,8 +1094,8 @@ void COverlayMgr::ReSortMaterials( void )
10941094
SurfaceCtx_t ctx;
10951095
SurfSetupSurfaceContext( ctx, pFrag->m_SurfId );
10961096

1097-
int nVertCount = pFrag->m_aPrimVerts.Count();
1098-
for ( int iVert = 0; iVert < nVertCount; ++iVert )
1097+
intp nVertCount = pFrag->m_aPrimVerts.Count();
1098+
for ( intp iVert = 0; iVert < nVertCount; ++iVert )
10991099
{
11001100
// Lightmap coordinates.
11011101
Vector2D uv;
@@ -1277,7 +1277,7 @@ void COverlayMgr::Disp_CreateFragments( moverlay_t *pOverlay, SurfaceHandle_t su
12771277
}
12781278
}
12791279

1280-
for ( int i = aDispFragments.Count(); --i >= 0; )
1280+
for ( intp i = aDispFragments.Count(); --i >= 0; )
12811281
{
12821282
DestroyTempFragment( aDispFragments[i] );
12831283
}
@@ -1313,7 +1313,7 @@ bool COverlayMgr::Disp_PreClipFragment( moverlay_t *pOverlay, OverlayFragmentVec
13131313
Surf_ClipFragment( pOverlay, overlayFrag, surfID, surfaceFrag );
13141314

13151315
// Get fragment vertex count.
1316-
int nVertCount = overlayFrag.m_aPrimVerts.Count();
1316+
intp nVertCount = overlayFrag.m_aPrimVerts.Count();
13171317
if ( nVertCount == 0 )
13181318
return false;
13191319

@@ -1387,14 +1387,14 @@ void COverlayMgr::Disp_PostClipFragment( CDispInfo *pDisp, CMeshReader *pReader,
13871387
pReader->TexCoord2f( nInterval * ( nInterval - 1 ), DISP_LMCOORDS_STAGE, lightCoords[3].x, lightCoords[3].y );
13881388

13891389
// Get the number of displacement fragments.
1390-
int nFragCount = aDispFragments.Count();
1391-
for ( int iFrag = 0; iFrag < nFragCount; ++iFrag )
1390+
intp nFragCount = aDispFragments.Count();
1391+
for ( intp iFrag = 0; iFrag < nFragCount; ++iFrag )
13921392
{
13931393
moverlayfragment_t *pDispFragment = aDispFragments[iFrag];
13941394
if ( !pDispFragment )
13951395
continue;
13961396

1397-
int nVertCount = pDispFragment->m_aPrimVerts.Count();
1397+
intp nVertCount = pDispFragment->m_aPrimVerts.Count();
13981398
if ( nVertCount < 3 )
13991399
continue;
14001400

@@ -1518,8 +1518,8 @@ void COverlayMgr::Disp_DoClip( CDispInfo *pDisp, OverlayFragmentVector_t &aDispF
15181518
aDispFragments.Purge();
15191519

15201520
// Clip in V.
1521-
int nFragCount = aClippedFragments.Count();
1522-
for ( int iFrag = 0; iFrag < nFragCount; iFrag++ )
1521+
intp nFragCount = aClippedFragments.Count();
1522+
for ( intp iFrag = 0; iFrag < nFragCount; iFrag++ )
15231523
{
15241524
moverlayfragment_t *pClipFrag = aClippedFragments[iFrag];
15251525
if ( pClipFrag )
@@ -1583,7 +1583,7 @@ void COverlayMgr::DoClipFragment( moverlayfragment_t *pFragment, cplane_t *pClip
15831583
// Determine "sidedness" of all the polygon points.
15841584
//
15851585
nSideCounts[0] = nSideCounts[1] = nSideCounts[2] = 0;
1586-
int iVert = 0;
1586+
intp iVert = 0;
15871587
for ( ; iVert < pFragment->m_aPrimVerts.Count(); ++iVert )
15881588
{
15891589
flDists[iVert] = pClipPlane->normal.Dot( pFragment->m_aPrimVerts[iVert].pos ) - pClipPlane->dist;
@@ -1635,7 +1635,7 @@ void COverlayMgr::DoClipFragment( moverlayfragment_t *pFragment, cplane_t *pClip
16351635

16361636
MEM_ALLOC_CREDIT();
16371637

1638-
int nVertCount = pFragment->m_aPrimVerts.Count();
1638+
intp nVertCount = pFragment->m_aPrimVerts.Count();
16391639
for ( iVert = 0; iVert < nVertCount; ++iVert )
16401640
{
16411641
// "On" clip plane.
@@ -1687,7 +1687,7 @@ void COverlayMgr::DoClipFragment( moverlayfragment_t *pFragment, cplane_t *pClip
16871687
//-----------------------------------------------------------------------------
16881688
// Copies a fragment into the main fragment list
16891689
//-----------------------------------------------------------------------------
1690-
OverlayFragmentHandle_t COverlayMgr::AddFragmentToFragmentList( int nSize )
1690+
OverlayFragmentHandle_t COverlayMgr::AddFragmentToFragmentList( intp nSize )
16911691
{
16921692
MEM_ALLOC_CREDIT();
16931693

@@ -1784,8 +1784,8 @@ void COverlayMgr::BuildClipPlanes( SurfaceHandle_t surfID, moverlayfragment_t &s
17841784
const Vector &vecBasisNormal,
17851785
CUtlVector<cplane_t> &m_ClipPlanes )
17861786
{
1787-
int nVertCount = surfaceFrag.m_aPrimVerts.Count();
1788-
for ( int iVert = 0; iVert < nVertCount; ++iVert )
1787+
intp nVertCount = surfaceFrag.m_aPrimVerts.Count();
1788+
for ( intp iVert = 0; iVert < nVertCount; ++iVert )
17891789
{
17901790
Vector vecEdge;
17911791
vecEdge = surfaceFrag.m_aPrimVerts[(iVert+1)%nVertCount].pos - surfaceFrag.m_aPrimVerts[iVert].pos;

0 commit comments

Comments
 (0)