optimizations

Author: mastercoms

game/client/tf/vgui/tf_classmenu.cpp

@@ -1200,7 +1200,10 @@ void CTFClassMenu::SetVisible( bool state )
 
 	if ( state )
 	{
-		m_pTFPlayerModelPanel->SetVisible(true);
+		if (m_pTFPlayerModelPanel)
+		{
+			m_pTFPlayerModelPanel->SetVisible(true);
+		}
 		engine->ServerCmd( "menuopen" );			// to the server
 		engine->ClientCmd( "_cl_classmenuopen 1" );	// for other panels
 		CBroadcastRecipientFilter filter;
@@ -1221,7 +1224,10 @@ void CTFClassMenu::SetVisible( bool state )
 		engine->ServerCmd( "menuclosed" );	
 		engine->ClientCmd( "_cl_classmenuopen 0" );
 
-		m_pTFPlayerModelPanel->SetVisible(false);
+		if (m_pTFPlayerModelPanel)
+		{
+			m_pTFPlayerModelPanel->SetVisible(false);
+		}
 
 		if ( TFGameRules() && TFGameRules()->IsMannVsMachineMode() )
 		{

materialsystem/shaderapidx9/shaderdevicedx8.cpp

@@ -155,7 +155,7 @@ bool CShaderDeviceMgrDx8::Connect( CreateInterfaceFn factory )
 								( CommandLine()->ParmValue( "-dxlevel", 100 ) < 90 );
 
 	bool bD3D9ExAvailable = false;
-	if ( HMODULE hMod = ::LoadLibraryA( "d3d9.dll" ) )
+	if ( HMODULE hMod = ::LoadLibraryA ( "d3d9.dll" ) )
 	{
 		typedef HRESULT ( WINAPI *CreateD3D9ExFunc_t )( UINT, IUnknown** );
 		if ( CreateD3D9ExFunc_t pfnCreateD3D9Ex = (CreateD3D9ExFunc_t) ::GetProcAddress( hMod, "Direct3DCreate9Ex" ) )
@@ -1775,50 +1775,57 @@ void CShaderDeviceDx8::SetPresentParameters( void* hWnd, int nAdapter, const Sha
 		m_PresentParameters.BackBufferCount = 0;
 	}
 
-	if ( info.m_nAASamples > 1 && ( m_PresentParameters.SwapEffect == D3DSWAPEFFECT_DISCARD ) )
+	if ( info.m_nAASamples > 1 )
 	{
-		D3DMULTISAMPLE_TYPE multiSampleType = ComputeMultisampleType( info.m_nAASamples );
-		DWORD nQualityLevel;
-
-		// FIXME: Should we add the quality level to the ShaderAdapterMode_t struct?
-		// 16x on nVidia refers to CSAA or "Coverage Sampled Antialiasing"
-		const HardwareCaps_t &adapterCaps = g_ShaderDeviceMgrDx8.GetHardwareCaps( nAdapter );
-		if ( ( info.m_nAASamples == 16 ) && ( adapterCaps.m_VendorID == VENDORID_NVIDIA ) )
-		{
-			multiSampleType = ComputeMultisampleType(4);
-			hr = D3D()->CheckDeviceMultiSampleType( nAdapter, DX8_DEVTYPE, 
-				m_PresentParameters.BackBufferFormat, m_PresentParameters.Windowed, 
-				multiSampleType, &nQualityLevel );						// 4x at highest quality level
-
-			if ( !FAILED( hr ) && ( nQualityLevel == 16 ) )
-			{
-				nQualityLevel = nQualityLevel - 1;						// Highest quality level triggers 16x CSAA
-			}
-			else
-			{
-				nQualityLevel  = 0;										// No CSAA
-			}
-		}
-		else	// Regular MSAA on any old vendor
-		{
-			hr = D3D()->CheckDeviceMultiSampleType( nAdapter, DX8_DEVTYPE, 
-				m_PresentParameters.BackBufferFormat, m_PresentParameters.Windowed, 
-				multiSampleType, &nQualityLevel );
-
-			nQualityLevel = 0;
-		}
-
-		if ( !FAILED( hr ) )
+		if (m_PresentParameters.SwapEffect == D3DSWAPEFFECT_DISCARD)
 		{
-			m_PresentParameters.MultiSampleType = multiSampleType;
-			m_PresentParameters.MultiSampleQuality = nQualityLevel;
+		    D3DMULTISAMPLE_TYPE multiSampleType = ComputeMultisampleType( info.m_nAASamples );
+		    DWORD nQualityLevel;
+
+		    // FIXME: Should we add the quality level to the ShaderAdapterMode_t struct?
+		    // 16x on nVidia refers to CSAA or "Coverage Sampled Antialiasing"
+		    const HardwareCaps_t &adapterCaps = g_ShaderDeviceMgrDx8.GetHardwareCaps( nAdapter );
+		    if ( ( info.m_nAASamples == 16 ) && ( adapterCaps.m_VendorID == VENDORID_NVIDIA ) )
+		    {
+			    multiSampleType = ComputeMultisampleType(4);
+			    hr = D3D()->CheckDeviceMultiSampleType( nAdapter, DX8_DEVTYPE, 
+				    m_PresentParameters.BackBufferFormat, m_PresentParameters.Windowed, 
+				    multiSampleType, &nQualityLevel );						// 4x at highest quality level
+
+			    if ( !FAILED( hr ) && ( nQualityLevel == 16 ) )
+			    {
+				    nQualityLevel = nQualityLevel - 1;						// Highest quality level triggers 16x CSAA
+			    }
+			    else
+			    {
+				    nQualityLevel  = 0;										// No CSAA
+			    }
+		    }
+		    else	// Regular MSAA on any old vendor
+		    {
+			    hr = D3D()->CheckDeviceMultiSampleType( nAdapter, DX8_DEVTYPE, 
+				    m_PresentParameters.BackBufferFormat, m_PresentParameters.Windowed, 
+				    multiSampleType, &nQualityLevel );
+
+			    nQualityLevel = 0;
+		    }
+
+		    if ( !FAILED( hr ) )
+		    {
+			    m_PresentParameters.MultiSampleType = multiSampleType;
+			    m_PresentParameters.MultiSampleQuality = nQualityLevel;
+				return;
+		    }
 		}
 	}
-	else
+	m_PresentParameters.MultiSampleType = D3DMULTISAMPLE_NONE;
+	m_PresentParameters.MultiSampleQuality = 0;
+#if defined(IS_WINDOWS_PC) && defined(SHADERAPIDX9)
+	if (m_PresentParameters.Windowed && g_ShaderDeviceUsingD3D9Ex)
 	{
-		m_PresentParameters.MultiSampleType = D3DMULTISAMPLE_NONE;
-		m_PresentParameters.MultiSampleQuality = 0;
+		m_PresentParameters.SwapEffect = D3DSWAPEFFECT_FLIPEX;
 	}
+#endif
 }
 
 
@@ -2410,7 +2417,7 @@ bool CShaderDeviceDx8::CreateD3DDevice( void* pHWnd, int nAdapter, const ShaderD
 
 	g_pHardwareConfig->SetupHardwareCaps( info, g_ShaderDeviceMgrDx8.GetHardwareCaps( nAdapter ) );
 
-#ifndef DX_TO_GL_ABSTRACTION
+#if defined(IS_WINDOWS_PC) && defined(SHADERAPIDX9)
 	if (g_ShaderDeviceUsingD3D9Ex)
 	{
 		Dx9ExDevice()->SetMaximumFrameLatency(1);
@@ -3409,8 +3416,8 @@ void CShaderDeviceDx8::Present()
 			s_bSetPriority = true;
 			bValidPresent = false;
 		}
-#ifndef DX_TO_GL_ABSTRACTION
-		if (s_bSetPriority && g_ShaderDeviceUsingD3D9Ex)
+#if defined(IS_WINDOWS_PC) && defined(SHADERAPIDX9)
+		if (bValidPresent && s_bSetPriority && g_ShaderDeviceUsingD3D9Ex)
 		{
 			s_bSetPriority = false;
 			Dx9ExDevice()->SetGPUThreadPriority(7);
@@ -3453,10 +3460,14 @@ void CShaderDeviceDx8::Present()
 		else
 		{
 			g_pShaderAPI->OwnGPUResources( false );
-#ifndef DX_TO_GL_ABSTRACTION
-			if (g_ShaderDeviceUsingD3D9Ex && m_PresentParameters.PresentationInterval != D3DPRESENT_INTERVAL_IMMEDIATE)
+#if defined(IS_WINDOWS_PC) && defined(SHADERAPIDX9)
+			if (g_ShaderDeviceUsingD3D9Ex)
 			{
 				int flags = D3DPRESENT_DONOTWAIT;
+				if (m_PresentParameters.PresentationInterval == D3DPRESENT_INTERVAL_IMMEDIATE && m_PresentParameters.SwapEffect == D3DSWAPEFFECT_FLIPEX)
+				{
+					flags |= D3DPRESENT_FORCEIMMEDIATE;
+				}
 				hr = Dx9ExDevice()->PresentEx(0, 0, 0, 0, flags);
 			}
 			else

materialsystem/shaderapidx9/shaderdevicedx8.h

@@ -360,7 +360,7 @@ FORCEINLINE IDirect3DDevice9 *Dx9Device()
 {
 	return g_pD3DDevice;
 }
-#ifndef DX_TO_GL_ABSTRACTION
+#if defined(IS_WINDOWS_PC) && defined(SHADERAPIDX9)
 FORCEINLINE IDirect3DDevice9Ex* Dx9ExDevice()
 {
 	return (IDirect3DDevice9Ex*)g_pD3DDevice;