fortressforever
/
fortressforever-2013
mirror of https://github.com/fortressforever/fortressforever-2013.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix messed up the merge on ISurface.h, this is the breaking interface change

This commit is contained in:
Dexter 2014-05-16 09:13:23 +00:00 committed by squeek
parent d5d7f3d571
commit 86510f40a2
2 changed files with 6702 additions and 6698 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mp/src/game/client/viewrender.cpp
View File

@ -2277,7 +2277,7 @@ void CViewRender::RenderView( const CViewSetup &view, int nClearFlags, int whatT
// let vgui know where to render stuff for the forced-to-framebuffer panels // let vgui know where to render stuff for the forced-to-framebuffer panels
if( UseVR() ) if( UseVR() )
{ {
vgui::surface()->SetFullscreenViewportAndRenderTarget( viewFramebufferX, viewFramebufferY, viewFramebufferWidth, viewFramebufferHeight, saveRenderTarget ); g_pMatSystemSurface->SetFullscreenViewportAndRenderTarget( viewFramebufferX, viewFramebufferY, viewFramebufferWidth, viewFramebufferHeight, saveRenderTarget );
} }
// clear the render target if we need to // clear the render target if we need to
@ -3914,7 +3914,7 @@ static void DrawOpaqueRenderables_DrawStaticProps( CClientRenderablesList::CEntr
for( CClientRenderablesList::CEntry *itEntity = pEntitiesBegin; itEntity < pEntitiesEnd; ++ itEntity ) for( CClientRenderablesList::CEntry *itEntity = pEntitiesBegin; itEntity < pEntitiesEnd; ++ itEntity )
{ {
if ( itEntity->m_pRenderable ) if ( itEntity->m_pRenderable )
NULL; /**/;
else else
continue; continue;
@ -3964,7 +3964,7 @@ void CRendering3dView::DrawOpaqueRenderables( ERenderDepthMode DepthMode )
RopeManager()->ResetRenderCache(); RopeManager()->ResetRenderCache();
g_pParticleSystemMgr->ResetRenderCache(); g_pParticleSystemMgr->ResetRenderCache();
bool const bDrawopaquestaticpropslast = r_drawopaquestaticpropslast.GetBool(); //bool const bDrawopaquestaticpropslast = r_drawopaquestaticpropslast.GetBool();
// //
@ -4130,16 +4130,20 @@ void CRendering3dView::DrawOpaqueRenderables( ERenderDepthMode DepthMode )
for ( int bucket = 0; bucket < RENDER_GROUP_CFG_NUM_OPAQUE_ENT_BUCKETS; ++ bucket ) for ( int bucket = 0; bucket < RENDER_GROUP_CFG_NUM_OPAQUE_ENT_BUCKETS; ++ bucket )
{ {
if ( bDrawopaquestaticpropslast ) // PVS-Studio pointed out that the two sides of the if/else were identical. Fixing
// this long-broken behavior would change rendering, so I fixed the code but
// commented out the new behavior. Uncomment the if statement and else block
// when needed.
//if ( bDrawopaquestaticpropslast )
{ {
DrawOpaqueRenderables_Range( pEnts[bucket][0], pEnts[bucket][1], DepthMode ); DrawOpaqueRenderables_Range( pEnts[bucket][0], pEnts[bucket][1], DepthMode );
DrawOpaqueRenderables_DrawStaticProps( pProps[bucket][0], pProps[bucket][1], DepthMode ); DrawOpaqueRenderables_DrawStaticProps( pProps[bucket][0], pProps[bucket][1], DepthMode );
} }
else /*else
{ {
DrawOpaqueRenderables_Range( pEnts[bucket][0], pEnts[bucket][1], DepthMode );
DrawOpaqueRenderables_DrawStaticProps( pProps[bucket][0], pProps[bucket][1], DepthMode ); DrawOpaqueRenderables_DrawStaticProps( pProps[bucket][0], pProps[bucket][1], DepthMode );
} DrawOpaqueRenderables_Range( pEnts[bucket][0], pEnts[bucket][1], DepthMode );
}*/
} }

2
mp/src/public/vgui/ISurface.h
View File

@ -387,7 +387,7 @@ public:
virtual IHTMLChromeController *AccessChromeHTMLController() = 0; virtual IHTMLChromeController *AccessChromeHTMLController() = 0;
// the origin of the viewport on the framebuffer (Which might not be 0,0 for stereo) // the origin of the viewport on the framebuffer (Which might not be 0,0 for stereo)
virtual void SetFullscreenViewportAndRenderTarget( int x, int y, int w, int h, ITexture *pRenderTarget ) = 0; virtual void SetFullscreenViewport( int x, int y, int w, int h ) = 0; // this uses NULL for the render target.
virtual void GetFullscreenViewport( int & x, int & y, int & w, int & h ) = 0; virtual void GetFullscreenViewport( int & x, int & y, int & w, int & h ) = 0;
virtual void PushFullscreenViewport() = 0; virtual void PushFullscreenViewport() = 0;
virtual void PopFullscreenViewport() = 0; virtual void PopFullscreenViewport() = 0;