pending: assorted experimented changes yet to be added to patch set

Author: mastercoms

src/datacache/mdlcache.cpp

@@ -78,12 +78,6 @@ namespace {
 #define MdlCacheMsg		if ( !LogMdlCache() ) ; else Msg
 #define MdlCacheWarning if ( !LogMdlCache() ) ; else Warning
 
-#if defined( _X360 )
-#define AsyncMdlCache() 0	// Explicitly OFF for 360 (incompatible)
-#else
-#define AsyncMdlCache() 0
-#endif
-
 #define ERROR_MODEL		"models/error.mdl"
 #define IDSTUDIOHEADER	(('T'<<24)+('S'<<16)+('D'<<8)+'I')
 
@@ -184,7 +178,7 @@ class CTempAllocHelper
 // ConVars
 //-----------------------------------------------------------------------------
 static ConVar r_rootlod( "r_rootlod", "0", FCVAR_ARCHIVE );
-static ConVar mod_forcedata( "mod_forcedata", ( AsyncMdlCache() ) ? "0" : "1",	0, "Forces all model file data into cache on model load." );
+static ConVar mod_forcedata( "mod_forcedata", "1",	0, "Forces all model file data into cache on model load." );
 static ConVar mod_test_not_available( "mod_test_not_available", "0", FCVAR_CHEAT );
 static ConVar mod_test_mesh_not_available( "mod_test_mesh_not_available", "0", FCVAR_CHEAT );
 static ConVar mod_test_verts_not_available( "mod_test_verts_not_available", "0", FCVAR_CHEAT );

src/engine/audio/private/snd_dma.cpp

@@ -70,7 +70,7 @@ extern IVideoServices *g_pVideo;
 #define DIST_MULT_TO_SNDLVL( dist_mult ) (soundlevel_t)(int)( dist_mult ? ( 20 * log10( pow( 10.0f, snd_refdb.GetFloat() / 20 ) / (dist_mult * snd_refdist.GetFloat()) ) ) : 0 )
 
 #if !defined( _X360 )
-#define THREADED_MIX_TIME 0.015
+#define THREADED_MIX_TIME 0.005
 #else
 #define THREADED_MIX_TIME XMA_POLL_RATE * 0.001
 #endif
@@ -470,7 +470,7 @@ static ConVar volume( "volume", "1.0", FCVAR_ARCHIVE | FCVAR_ARCHIVE_XBOX, "Soun
 // user configurable music volume
 ConVar snd_musicvolume( "snd_musicvolume", "1.0", FCVAR_ARCHIVE | FCVAR_ARCHIVE_XBOX, "Music volume", true, 0.0f, true, 1.0f );	
 
-ConVar snd_mixahead( "snd_mixahead", "0.1", FCVAR_DEVELOPMENTONLY ); // 
+ConVar snd_mixahead( "snd_threaded_mixahead", "0.1", 0 );
 #ifdef THREADED_SOUND_UPDATE
 ConVar snd_mix_async( "snd_mix_async", "1" );
 #else

src/engine/cmd.cpp

@@ -685,7 +685,7 @@ void Cmd_Exec_f( const CCommand &args )
 		}
 	}
 	// force any queued convar changes to flush before reading/writing them
-	UpdateMaterialSystemConfig();
+	//UpdateMaterialSystemConfig();
 }
 
 

src/engine/dt_encode.cpp

@@ -222,52 +222,47 @@ void DecodeInfo::CopyVars( const DecodeInfo *pOther )
 
 void Int_Encode( const unsigned char *pStruct, DVariant *pVar, const SendProp *pProp, bf_write *pOut, int objectID )
 {
-	int nValue = pVar->m_Int;
-	
 	if ( pProp->GetFlags() & SPROP_VARINT)
 	{
 		if ( pProp->GetFlags() & SPROP_UNSIGNED )
 		{
-			pOut->WriteVarInt32( nValue );
+			pOut->WriteVarInt32( pVar->m_Int );
 		}
 		else
 		{
-			pOut->WriteSignedVarInt32( nValue );
+			pOut->WriteSignedVarInt32( pVar->m_Int );
 		}
 	}
 	else
 	{
-		// If signed, preserve lower bits and then re-extend sign if nValue < 0;
-		// if unsigned, preserve all 32 bits no matter what. Bonus: branchless.
-		int nPreserveBits = ( 0x7FFFFFFF >> ( 32 - pProp->m_nBits ) );
-		nPreserveBits |= ( pProp->GetFlags() & SPROP_UNSIGNED ) ? 0xFFFFFFFF : 0;
-		int nSignExtension = ( nValue >> 31 ) & ~nPreserveBits;
-
-		nValue &= nPreserveBits;
-		nValue |= nSignExtension;
-
 #ifdef DBGFLAG_ASSERT
 		// Assert that either the property is unsigned and in valid range,
 		// or signed with a consistent sign extension in the high bits
 		if ( pProp->m_nBits < 32 )
 		{
 			if ( pProp->GetFlags() & SPROP_UNSIGNED )
 			{
-				AssertMsg3( nValue == pVar->m_Int, "Unsigned prop %s needs more bits? Expected %i == %i", pProp->GetName(), nValue, pVar->m_Int );
+				int32 nMaskedValue = pVar->m_Int;
+				nMaskedValue &= (1u << pProp->m_nBits) - 1;
+				Assert(nMaskedValue == pVar->m_Int);
 			}
 			else 
 			{
-				AssertMsg3( nValue == pVar->m_Int, "Signed prop %s needs more bits? Expected %i == %i", pProp->GetName(), nValue, pVar->m_Int );
+				int32 nSignExtendedValue = pVar->m_Int;
+				nSignExtendedValue <<= 32 - pProp->m_nBits;
+				nSignExtendedValue >>= 32 - pProp->m_nBits;
+				Assert(nSignExtendedValue == pVar->m_Int);
 			}
 		}
+#endif
+		if (pProp->IsSigned())
+		{
+			pOut->WriteSBitLong(pVar->m_Int, pProp->m_nBits);
+		}
 		else
 		{
-			// This should never trigger, but I'm leaving it in for old-time's sake.
-			Assert( nValue == pVar->m_Int );
+			pOut->WriteUBitLong((unsigned int)pVar->m_Int, pProp->m_nBits);
 		}
-#endif
-
-		pOut->WriteUBitLong( nValue, pProp->m_nBits, false );
 	}
 }
 
@@ -322,7 +317,7 @@ int Int_CompareDeltas( const SendProp *pProp, bf_read *p1, bf_read *p2 )
 		return p1->ReadSignedVarInt32() != p2->ReadSignedVarInt32();
 	}
 
-	return p1->CompareBits(p2, pProp->m_nBits);
+	return p1->ReadUBitLong(pProp->m_nBits) != p2->ReadUBitLong(pProp->m_nBits);
 }
 
 const char* Int_GetTypeNameString()

src/engine/enginetrace.cpp

@@ -73,7 +73,7 @@ abstract_class CEngineTrace : public IEngineTrace
 	CEngineTrace() { m_pRootMoveParent = NULL; }
 	// Returns the contents mask at a particular world-space position
 	virtual int		GetPointContents( const Vector &vecAbsPosition, IHandleEntity** ppEntity );
-
+	virtual int		GetPointContents_WorldOnly( const Vector &vecAbsPosition );
 	virtual int		GetPointContents_Collideable( ICollideable *pCollide, const Vector &vecAbsPosition );
 
 	// Traces a ray against a particular edict
@@ -376,6 +376,16 @@ class CPointContentsEnum : public IPartitionEnumerator
 };
 
 
+//-----------------------------------------------------------------------------
+// Returns the world contents
+//-----------------------------------------------------------------------------
+int	CEngineTrace::GetPointContents_WorldOnly( const Vector &vecAbsPosition )
+{
+	int nContents = CM_PointContents( vecAbsPosition, 0 );
+
+	return nContents;
+}
+
 //-----------------------------------------------------------------------------
 // Returns the contents mask at a particular world-space position
 //-----------------------------------------------------------------------------

src/engine/l_studio.cpp

@@ -3179,15 +3179,18 @@ int CModelRender::DrawStaticPropArrayFast( StaticPropRenderInfo_t *pProps, int c
 #endif // SWDS
 }
 
+#ifndef SWDS
+static ConVar r_shadowlod("r_shadowlod", "-1");
+static ConVar r_shadowlodbias("r_shadowlodbias", "2");
+#endif
+
 //-----------------------------------------------------------------------------
 // Shadow rendering
 //-----------------------------------------------------------------------------
 matrix3x4_t* CModelRender::DrawModelShadowSetup( IClientRenderable *pRenderable, int body, int skin, DrawModelInfo_t *pInfo, matrix3x4_t *pCustomBoneToWorld )
 {
 #ifndef SWDS
 	DrawModelInfo_t &info = *pInfo;
-	static ConVar r_shadowlod("r_shadowlod", "-1");
-	static ConVar r_shadowlodbias("r_shadowlodbias", "2");
 
 	model_t const* pModel = pRenderable->GetModel();
 	if ( !pModel )

src/engine/modelloader.cpp

@@ -5022,7 +5022,7 @@ void CModelLoader::Studio_LoadModel( model_t *pModel, bool bTouchAllData )
 	if ( bLoadPhysics && !bPreLoaded )
 	{
 		// load the collision data now
-		bool bSynchronous = bTouchAllData;
+		bool bSynchronous = bTouchAllData && !AsyncMdlCache();
 		double t1 = Plat_FloatTime();
 		g_pMDLCache->GetVCollideEx( pModel->studio, bSynchronous );
 

src/engine/shadowmgr.cpp

@@ -1746,7 +1746,8 @@ void CShadowMgr::ApplyShadowToLeaf( const Shadow_t &shadow, mleaf_t* RESTRICT pL
 	// computation and at that point we'll remove surfaces that don't
 	// actually hit the surface
 	SurfaceHandle_t *pHandle = &host_state.worldbrush->marksurfaces[pLeaf->firstmarksurface];
-	for ( int i = 0; i < pLeaf->nummarksurfaces; i++ )
+	const int nMarkSurfaces = pLeaf->nummarksurfaces;
+	for ( int i = 0; i < nMarkSurfaces; i++ )
 	{
 		SurfaceHandleRestrict_t surfID = pHandle[i];
 

src/engine/sv_client.cpp

@@ -39,7 +39,7 @@ extern CNetworkStringTableContainer *networkStringTableContainerServer;
 
 static ConVar	sv_timeout( "sv_timeout", "65", 0, "After this many seconds without a message from a client, the client is dropped" );
 static ConVar	sv_maxrate( "sv_maxrate", "0", FCVAR_REPLICATED, "Max bandwidth rate allowed on server, 0 == unlimited" );
-static ConVar	sv_minrate( "sv_minrate", "3500", FCVAR_REPLICATED, "Min bandwidth rate allowed on server, 0 == unlimited" );
+static ConVar	sv_minrate( "sv_minrate", V_STRINGIFY( DEFAULT_RATE ), FCVAR_REPLICATED, "Min bandwidth rate allowed on server, 0 == unlimited" );
 
        ConVar	sv_maxupdaterate( "sv_maxupdaterate", "66", FCVAR_REPLICATED, "Maximum updates per second that the server will allow" );
 	   ConVar	sv_minupdaterate( "sv_minupdaterate", "10", FCVAR_REPLICATED, "Minimum updates per second that the server will allow" );

src/engine/sys_engine.cpp

@@ -35,9 +35,6 @@
 #include "vgui_baseui_interface.h"
 #endif
 #include "tier0/etwprof.h"
-#ifdef IS_WINDOWS_PC
-#include <windows.h>
-#endif
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
@@ -367,12 +364,9 @@ void CEngine::Frame( void )
 			while ( Plat_FloatTime() < fWaitEnd )
 			{
 				ThreadPause();
-				// Yield the CPU to other threads.
-#ifdef IS_WINDOWS_PC
-				SwitchToThread();
-#elif defined( POSIX )
-				sched_yield();
-#endif
+				// Yield the CPU to other threads so we don't spin too tightly
+				// ThreadSleep(0) is not tight enough.
+				ThreadYield();
 			}
 
 			// Go back to the top of the loop and see if it is time yet.