id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-06-02 09:41:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Astyle

Browse source
This commit is contained in:
Robert Beckebans 2017-09-03 09:45:03 +02:00
parent 72091f73ca
commit 4daffd67c0
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
neo/renderer/Framebuffer.cpp
View file

@ -96,7 +96,7 @@ void Framebuffer::Init()
} }
// HDR // HDR
int screenWidth = renderSystem->GetWidth(); int screenWidth = renderSystem->GetWidth();
int screenHeight = renderSystem->GetHeight(); int screenHeight = renderSystem->GetHeight();
@ -207,7 +207,7 @@ void Framebuffer::CheckFramebuffers()
{ {
int screenWidth = renderSystem->GetWidth(); int screenWidth = renderSystem->GetWidth();
int screenHeight = renderSystem->GetHeight(); int screenHeight = renderSystem->GetHeight();
if( globalFramebuffers.hdrFBO->GetWidth() != screenWidth || globalFramebuffers.hdrFBO->GetHeight() != screenHeight ) if( globalFramebuffers.hdrFBO->GetWidth() != screenWidth || globalFramebuffers.hdrFBO->GetHeight() != screenHeight )
{ {
Unbind(); Unbind();
@ -224,7 +224,7 @@ void Framebuffer::CheckFramebuffers()
globalFramebuffers.hdrNonMSAAFBO->Bind(); globalFramebuffers.hdrNonMSAAFBO->Bind();
globalFramebuffers.hdrNonMSAAFBO->AttachImage2D( GL_TEXTURE_2D, globalImages->currentRenderHDRImageNoMSAA, 0 ); globalFramebuffers.hdrNonMSAAFBO->AttachImage2D( GL_TEXTURE_2D, globalImages->currentRenderHDRImageNoMSAA, 0 );
globalFramebuffers.hdrNonMSAAFBO->Check(); globalFramebuffers.hdrNonMSAAFBO->Check();
globalFramebuffers.hdrNonMSAAFBO->width = screenWidth; globalFramebuffers.hdrNonMSAAFBO->width = screenWidth;
globalFramebuffers.hdrNonMSAAFBO->height = screenHeight; globalFramebuffers.hdrNonMSAAFBO->height = screenHeight;

4
neo/renderer/RenderProgs.cpp
View file

@ -200,10 +200,10 @@ void idRenderProgManager::Init()
LoadFragmentShader( i ); LoadFragmentShader( i );
LoadGLSLProgram( i, i, i ); LoadGLSLProgram( i, i, i );
} }
r_useHalfLambertLighting.ClearModified(); r_useHalfLambertLighting.ClearModified();
r_useHDR.ClearModified(); r_useHDR.ClearModified();
// special case handling for fastZ shaders // special case handling for fastZ shaders
/* /*
switch( glConfig.driverType ) switch( glConfig.driverType )

4
neo/renderer/RenderSystem.cpp
View file

@ -314,8 +314,8 @@ static void R_CheckCvars()
break; break;
} }
} }
if (r_useHDR.IsModified() || r_useHalfLambertLighting.IsModified() ) if( r_useHDR.IsModified() || r_useHalfLambertLighting.IsModified() )
{ {
r_useHDR.ClearModified(); r_useHDR.ClearModified();
r_useHalfLambertLighting.ClearModified(); r_useHalfLambertLighting.ClearModified();

8
neo/renderer/RenderSystem_init.cpp
View file

@ -391,8 +391,8 @@ static void R_CheckPortableExtensions()
// RB: Mesa support // RB: Mesa support
if( idStr::Icmpn( glConfig.renderer_string, "Mesa", 4 ) == 0 || idStr::Icmpn( glConfig.renderer_string, "X.org", 5 ) == 0 || idStr::Icmpn( glConfig.renderer_string, "Gallium", 7 ) == 0 || if( idStr::Icmpn( glConfig.renderer_string, "Mesa", 4 ) == 0 || idStr::Icmpn( glConfig.renderer_string, "X.org", 5 ) == 0 || idStr::Icmpn( glConfig.renderer_string, "Gallium", 7 ) == 0 ||
strcmp( glConfig.vendor_string, "X.Org" ) == 0 || strcmp( glConfig.vendor_string, "X.Org" ) == 0 ||
idStr::Icmpn( glConfig.renderer_string, "llvmpipe", 8 ) == 0 ) idStr::Icmpn( glConfig.renderer_string, "llvmpipe", 8 ) == 0 )
{ {
if( glConfig.driverType == GLDRV_OPENGL32_CORE_PROFILE ) if( glConfig.driverType == GLDRV_OPENGL32_CORE_PROFILE )
{ {
@ -2792,9 +2792,9 @@ void idRenderSystemLocal::Init()
guiModel = new( TAG_RENDER ) idGuiModel; guiModel = new( TAG_RENDER ) idGuiModel;
guiModel->Clear(); guiModel->Clear();
tr_guiModel = guiModel; // for DeviceContext fast path tr_guiModel = guiModel; // for DeviceContext fast path
UpdateStereo3DMode(); UpdateStereo3DMode();
globalImages->Init(); globalImages->Init();
// RB begin // RB begin

2
neo/renderer/tr_local.h
View file

@ -851,7 +851,7 @@ public:
// internal functions // internal functions
idRenderSystemLocal(); idRenderSystemLocal();
~idRenderSystemLocal(); ~idRenderSystemLocal();
void UpdateStereo3DMode(); void UpdateStereo3DMode();
void Clear(); void Clear();