pending: experimental changes

Author: mastercoms

src/engine/cmodel.cpp

@@ -1570,7 +1570,7 @@ void FASTCALL CM_TraceToLeaf( TraceInfo_t * RESTRICT pTraceInfo, int ndxLeaf, fl
 		pCounters = pTraceInfo->GetDispCounters();
 		count = pTraceInfo->GetCount();
 
-		if (IsX360())
+		if (IsX360() || 1)
 		{
 			// set up some relatively constant variables we'll use in the loop below
 			fltx4 traceStart = LoadUnaligned3SIMD(pTraceInfo->m_start.Base());

src/engine/engine.vpc

@@ -31,7 +31,7 @@ $Configuration
 
 	$Compiler [$WIN32]
 	{
-		$EnableEnhancedInstructionSet	"Streaming SIMD Extensions (/arch:SSE)"
+		$EnableEnhancedInstructionSet	"Streaming SIMD Extensions 2 (/arch:SSE2)"
 	}
 
 	$Linker

src/engine/enginetool.cpp

@@ -444,7 +444,7 @@ void CEngineTool::SetGamePaused( bool paused )
 
 float CEngineTool::GetTimescale()
 {
-	return host_timescale.GetFloat();
+	return host_timescale.GetFloat() ? host_timescale.GetFloat() : 1.0f;
 }
 
 void CEngineTool::SetTimescale( float scale )

src/engine/gl_rsurf.cpp

@@ -47,6 +47,7 @@
 #include "materialsystem/imaterialvar.h"
 #include "coordsize.h"
 #include "mempool.h"
+#include "mathlib/ssemath.h"
 #ifndef SWDS
 #include "Overlay.h"
 #endif
@@ -4839,10 +4840,12 @@ static bool EnumerateLeafInBox_R(mnode_t *node, EnumLeafBoxInfo_t& info )
 	}
 }
 
-#ifdef _X360
 
+#if defined(_X360) || USE_DXMATH
+#ifdef _DEBUG
 static fltx4 AlignThatVector(const Vector &vc)
 {
+#ifdef _X360
 	fltx4 out = __loadunalignedvector(vc.Base());
 
 	/*
@@ -4853,7 +4856,12 @@ static fltx4 AlignThatVector(const Vector &vc)
 
 	// squelch the w component 
 	return __vrlimi( out, __vzero(), 1, 0 );
+#elif USE_DXMATH
+	fltx4 out = LoadUnaligned3SIMD(vc.Base());
+	return DirectX::XMVectorSetW(out, 0);
+#endif
 }
+#endif
 
 //-----------------------------------------------------------------------------
 // Finds all leaves of the BSP tree within a particular volume
@@ -4864,9 +4872,11 @@ static bool EnumerateLeafInBox_R(mnode_t * RESTRICT node, const EnumLeafBoxInfo_
 	if (node->contents == CONTENTS_SOLID)
 		return true;		// solid
 
+#ifdef _X360
 	// speculatively get the children into the cache
 	__dcbt(0,node->children[0]);
 	__dcbt(0,node->children[1]);
+#endif
 
 	// constructing these here prevents LHS if we spill.
 	// it's not quite a quick enough operation to do extemporaneously.
@@ -4937,6 +4947,7 @@ static bool EnumerateLeafInBox_R(mnode_t * RESTRICT node, const EnumLeafBoxInfo_
 	fltx4 vecBoxMax = LoadAlignedSIMD(pInfo->m_vecBoxMax);
 	fltx4 cornermin, cornermax;
 	// by now planeNormal is ready...
+#ifdef _X360
 	fltx4 control = XMVectorGreaterOrEqual( planeNormal, __vzero() );
 	// now control[i] = planeNormal[i] > 0 ? 0xFF : 0x00
 	cornermin = XMVectorSelect( vecBoxMax, vecBoxMin, control); // cornermin[i] = control[i] ? vecBoxMin[i] : vecBoxMax[i]
@@ -4945,6 +4956,7 @@ static bool EnumerateLeafInBox_R(mnode_t * RESTRICT node, const EnumLeafBoxInfo_
 	// compute dot products
 	fltx4 dotCornerMax = __vmsum3fp(planeNormal, cornermax); // vsumfp ignores w component
 	fltx4 dotCornerMin = __vmsum3fp(planeNormal, cornermin);
+
 	fltx4 vPlaneDist = ReplicateX4(plane->dist);
 	UINT conditionRegister;
 	XMVectorGreaterR(&conditionRegister,vPlaneDist,dotCornerMax);
@@ -4954,6 +4966,25 @@ static bool EnumerateLeafInBox_R(mnode_t * RESTRICT node, const EnumLeafBoxInfo_
 	XMVectorGreaterOrEqualR(&conditionRegister,dotCornerMin,vPlaneDist);
 	if ( XMComparisonAllTrue(conditionRegister) )
 		return EnumerateLeafInBox_R( node->children[0], pInfo );
+#elif USE_DXMATH
+	fltx4 control = DirectX::XMVectorGreaterOrEqual( planeNormal, LoadZeroSIMD() );
+	// now control[i] = planeNormal[i] > 0 ? 0xFF : 0x00
+	cornermin = DirectX::XMVectorSelect( vecBoxMax, vecBoxMin, control); // cornermin[i] = control[i] ? vecBoxMin[i] : vecBoxMax[i]
+	cornermax = DirectX::XMVectorSelect( vecBoxMin, vecBoxMax, control);
+	// compute dot products
+	fltx4 dotCornerMax = DirectX::XMVector3Dot(planeNormal, cornermax); // vsumfp ignores w component
+	fltx4 dotCornerMin = DirectX::XMVector3Dot(planeNormal, cornermin);
+
+	fltx4 vPlaneDist = ReplicateX4(plane->dist);
+	uint conditionRegister;
+	DirectX::XMVectorGreaterR(&conditionRegister,vPlaneDist,dotCornerMax);
+	if (DirectX::XMComparisonAllTrue(conditionRegister)) // plane->normal . cornermax <= plane->dist
+		return EnumerateLeafInBox_R( node->children[1], pInfo );
+
+	DirectX::XMVectorGreaterOrEqualR(&conditionRegister,dotCornerMin,vPlaneDist);
+	if ( DirectX::XMComparisonAllTrue(conditionRegister) )
+		return EnumerateLeafInBox_R( node->children[0], pInfo );
+#endif
 
 	return EnumerateLeafInBox_R( node->children[0], pInfo ) &&
 		   EnumerateLeafInBox_R( node->children[1], pInfo );
@@ -5326,7 +5357,7 @@ bool CEngineBSPTree::EnumerateLeavesInBox( const Vector& mins, const Vector& max
 	info.m_nContext = context;
 	info.m_vecBoxMax = maxs;
 	info.m_vecBoxMin = mins;
-#ifdef _X360
+#if defined(_X360) || USE_DXMATH
 	if (opt_EnumerateLeavesFastAlgorithm.GetBool())
 		return EnumerateLeafInBox_R( host_state.worldbrush->nodes, &info );
 	else

src/engine/host.cpp

@@ -585,7 +585,7 @@ static ConVar	host_profile( "host_profile","0" );
 
 ConVar	host_limitlocal( "host_limitlocal", "0", 0, "Apply cl_cmdrate and cl_updaterate to loopback connection" );
 ConVar	host_framerate( "host_framerate","0", 0, "Set to lock per-frame time elapse." );
-ConVar	host_timescale( "host_timescale","1.0", FCVAR_REPLICATED, "Prescale the clock by this amount." );
+ConVar	host_timescale( "host_timescale","0.0", FCVAR_REPLICATED, "Prescale the clock by this amount." );
 ConVar	host_speeds( "host_speeds","0", 0, "Show general system running times." );		// set for running times
 
 ConVar	host_flush_threshold( "host_flush_threshold", "20", 0, "Memory threshold below which the host should flush caches between server instances" );
@@ -1758,7 +1758,10 @@ void Host_ReadPreStartupConfiguration()
 	{
 		"sv_unlockedchapters",		// needed to display the startup graphic while loading
 		"snd_legacy_surround",		// needed to init the sound system
+#if defined( _X360 ) || defined( STAGING_ONLY )
 		"gameui_xbox",				// needed to initialize the correct UI
+#endif
+		"cl_hud_minmode",			// needed to initialize the correct UI
 		"save_in_memory"			// needed to preread data from the correct location in UI
 	};
 
@@ -1867,10 +1870,13 @@ void Host_AccumulateTime( float dt )
 		host_frametime	= host_state.interval_per_tick;
 	}
 
+	const bool bIsPlayingDemo = demoplayer->IsPlayingBack();
+	const float flDemoTimescale = bIsPlayingDemo ? demoplayer->GetPlaybackTimeScale() : 1.0f;
+
 #if 1
 	if ( host_framerate.GetFloat() > 0 
 #if !defined(SWDS)
-		&& ( CanCheat() || demoplayer->IsPlayingBack() ) 
+		&& ( CanCheat() || bIsPlayingDemo ) 
 #endif
 		)
 	{
@@ -1883,28 +1889,29 @@ void Host_AccumulateTime( float dt )
 
 #if !defined(SWDS) && defined( REPLAY_ENABLED )
 		extern IDemoPlayer *g_pReplayDemoPlayer;
-		if ( demoplayer->IsPlayingBack() && demoplayer == g_pReplayDemoPlayer )
+		if ( bIsPlayingDemo && demoplayer == g_pReplayDemoPlayer )
 		{
 			// adjust time scale if playing back demo
-			host_frametime *= demoplayer->GetPlaybackTimeScale();
+			host_frametime *= flDemoTimescale;
 		}
 #endif
 
 		host_frametime_unbounded = host_frametime;
 	}
 	else if (host_timescale.GetFloat() > 0 
 #if !defined(SWDS)
-		&& ( CanCheat() || demoplayer->IsPlayingBack() ) 
+		&& ( CanCheat() || bIsPlayingDemo ) 
+		|| ( bIsPlayingDemo && flDemoTimescale != 1.0f )
 #endif
 		)
 	{
 		float fullscale = host_timescale.GetFloat();
 
 #if !defined(SWDS)
-		if ( demoplayer->IsPlayingBack() )
+		if ( bIsPlayingDemo )
 		{
 			// adjust time scale if playing back demo
-			fullscale *= demoplayer->GetPlaybackTimeScale();
+			fullscale *= flDemoTimescale;
 		}
 #endif
 

src/engine/host.h

@@ -149,10 +149,10 @@ extern int	host_currentframetick;
 
 // PERFORMANCE INFO
 #define MIN_FPS         0.1         // Host minimum fps value for maxfps.
-#define MAX_FPS         1000.0        // Upper limit for maxfps.
+#define MAX_FPS         10000.0     // Upper limit for maxfps.
 
 #define MAX_FRAMETIME	0.1
-#define MIN_FRAMETIME	0.001
+#define MIN_FRAMETIME	0.0001
 
 #define TIME_TO_TICKS( dt )		( (int)( 0.5f + (float)(dt) / host_state.interval_per_tick ) )
 #define TICKS_TO_TIME( dt )		( host_state.interval_per_tick * (float)(dt) )

src/engine/l_studio.cpp

@@ -2785,11 +2785,11 @@ struct rbatch_t
 // ----------------------------------------
 */
 
-inline int FindModel( const CUtlVector<rmodel_t> &list, const model_t *pModel )
+inline int FindModel( const rmodel_t* pList, int listCount, const model_t* pModel )
 {
-	for ( int j = list.Count(); --j >= 0 ; )
+	for ( int j = listCount; --j >= 0 ; )
 	{
-		if ( list[j].pModel == pModel )
+		if ( pList[j].pModel == pModel )
 			return j;
 	}
 	return -1;
@@ -2806,13 +2806,13 @@ int CModelRender::DrawStaticPropArrayFast( StaticPropRenderInfo_t *pProps, int c
 #ifndef SWDS
 	MDLCACHE_CRITICAL_SECTION_( g_pMDLCache );
 	CMatRenderContextPtr pRenderContext( materials );
-	const int MAX_OBJECTS = 1024;
+	const int MAX_OBJECTS = 2048;
 	CUtlSortVector<robject_t, CRobjectLess> objectList(0, MAX_OBJECTS);
-	CUtlVector<rmodel_t> modelList(0,256);
-	CUtlVector<short> lightObjects(0,256);
-	CUtlVector<short> shadowObjects(0,64);
-	CUtlVector<rdecalmodel_t> decalObjects(0,64);
-	CUtlVector<LightingState_t> lightStates(0,256);
+	CUtlVectorFixedGrowable<rmodel_t, 256> modelList;
+	CUtlVectorFixedGrowable<short, 256> lightObjects;
+	CUtlVectorFixedGrowable<short, 64> shadowObjects;
+	CUtlVectorFixedGrowable<rdecalmodel_t, 64> decalObjects;
+	CUtlVectorFixedGrowable<LightingState_t, 256> lightStates;
 	bool bForceCubemap = r_showenvcubemap.GetBool();
 	int drawnCount = 0;
 	int forcedLodSetting = r_lod.GetInt();
@@ -2826,7 +2826,7 @@ int CModelRender::DrawStaticPropArrayFast( StaticPropRenderInfo_t *pProps, int c
 	{
 		drawnCount++;
 		// UNDONE: This is a perf hit in some scenes!  Use a hash?
-		int modelIndex = FindModel( modelList, pProps[i].pModel );
+		int modelIndex = FindModel( modelList.Base(), modelList.Count(), pProps[i].pModel );
 		if ( modelIndex < 0 )
 		{
 			modelIndex = modelList.AddToTail();

src/engine/modelloader.cpp

@@ -62,13 +62,7 @@
 
 ConVar mat_loadtextures( "mat_loadtextures", "1", FCVAR_CHEAT );
 
-// OS X and Linux are blowing up right now due to this.  Benefits vs possible regressions on DX less clear.
-#if defined( DX_TO_GL_ABSTRACTION ) || defined( STAGING_ONLY )
-	#define CONVAR_DEFAULT_MOD_OFFLINE_HDR_SWITCH "1"
-#else
-	#define CONVAR_DEFAULT_MOD_OFFLINE_HDR_SWITCH "0"
-#endif
-static ConVar mod_offline_hdr_switch( "mod_offline_hdr_switch", CONVAR_DEFAULT_MOD_OFFLINE_HDR_SWITCH, FCVAR_INTERNAL_USE,
+static ConVar mod_offline_hdr_switch( "mod_offline_hdr_switch", "1", FCVAR_INTERNAL_USE,
                                       "Re-order the HDR/LDR mode switch to do most of the material system "
                                       "reloading with the device offline. This reduces unnecessary device "
                                       "resource uploads and may drastically reduce load time and memory pressure "

src/engine/net_ws.cpp

@@ -2960,7 +2960,15 @@ void NET_SetTime( double flRealtime )
 	}
 
 	// adjust network time so fakelag works with host_timescale
-	net_time += frametime * host_timescale.GetFloat();
+	const float timescale = host_timescale.GetFloat();
+	if (timescale > 0)
+	{
+		net_time += frametime * timescale;
+	}
+	else
+	{
+		net_time += frametime;
+	}
 }
 
 /*

src/engine/vgui_baseui_interface.cpp

@@ -124,7 +124,9 @@ IGameConsole *staticGameConsole = NULL;
 bool s_bWindowsInputEnabled = true;
 
 ConVar r_drawvgui( "r_drawvgui", "1", FCVAR_CHEAT, "Enable the rendering of vgui panels" );
+#if defined( _X360 ) || defined( STAGING_ONLY )
 ConVar gameui_xbox( "gameui_xbox", "0", 0 );
+#endif
 
 void Con_CreateConsolePanel( vgui::Panel *parent );
 void CL_CreateEntityReportPanel( vgui::Panel *parent );
@@ -2142,11 +2144,11 @@ void VGui_FindNamedPanels( CUtlVector< vgui::VPANEL >& panelList, char const *pa
 	VGui_RecursiveFindPanels( panelList, embedded, panelname );
 }
 
-CON_COMMAND( vgui_togglepanel, "show/hide vgui panel by name." )
+CON_COMMAND_F( vgui_togglepanel, "show/hide vgui panel by name.", FCVAR_CHEAT )
 {
 	if ( args.ArgC() < 2 )
 	{
-		ConMsg( "Usage:  vgui_showpanel panelname\n" );
+		ConMsg( "Usage:  vgui_togglepanel panelname\n" );
 		return;
 	}