From 4daffd67c0fa89eeacdcf3e799247967686081a8 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Sun, 3 Sep 2017 09:45:03 +0200 Subject: [PATCH] Astyle --- neo/renderer/Framebuffer.cpp | 6 +++--- neo/renderer/RenderProgs.cpp | 4 ++-- neo/renderer/RenderSystem.cpp | 4 ++-- neo/renderer/RenderSystem_init.cpp | 8 ++++---- neo/renderer/tr_local.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/neo/renderer/Framebuffer.cpp b/neo/renderer/Framebuffer.cpp index 18352399..a9b728b3 100644 --- a/neo/renderer/Framebuffer.cpp +++ b/neo/renderer/Framebuffer.cpp @@ -96,7 +96,7 @@ void Framebuffer::Init() } // HDR - + int screenWidth = renderSystem->GetWidth(); int screenHeight = renderSystem->GetHeight(); @@ -207,7 +207,7 @@ void Framebuffer::CheckFramebuffers() { int screenWidth = renderSystem->GetWidth(); int screenHeight = renderSystem->GetHeight(); - + if( globalFramebuffers.hdrFBO->GetWidth() != screenWidth || globalFramebuffers.hdrFBO->GetHeight() != screenHeight ) { Unbind(); @@ -224,7 +224,7 @@ void Framebuffer::CheckFramebuffers() globalFramebuffers.hdrNonMSAAFBO->Bind(); globalFramebuffers.hdrNonMSAAFBO->AttachImage2D( GL_TEXTURE_2D, globalImages->currentRenderHDRImageNoMSAA, 0 ); globalFramebuffers.hdrNonMSAAFBO->Check(); - + globalFramebuffers.hdrNonMSAAFBO->width = screenWidth; globalFramebuffers.hdrNonMSAAFBO->height = screenHeight; diff --git a/neo/renderer/RenderProgs.cpp b/neo/renderer/RenderProgs.cpp index 694760dd..651ea89b 100644 --- a/neo/renderer/RenderProgs.cpp +++ b/neo/renderer/RenderProgs.cpp @@ -200,10 +200,10 @@ void idRenderProgManager::Init() LoadFragmentShader( i ); LoadGLSLProgram( i, i, i ); } - + r_useHalfLambertLighting.ClearModified(); r_useHDR.ClearModified(); - + // special case handling for fastZ shaders /* switch( glConfig.driverType ) diff --git a/neo/renderer/RenderSystem.cpp b/neo/renderer/RenderSystem.cpp index 2e875585..5dce4dcf 100644 --- a/neo/renderer/RenderSystem.cpp +++ b/neo/renderer/RenderSystem.cpp @@ -314,8 +314,8 @@ static void R_CheckCvars() break; } } - - if (r_useHDR.IsModified() || r_useHalfLambertLighting.IsModified() ) + + if( r_useHDR.IsModified() || r_useHalfLambertLighting.IsModified() ) { r_useHDR.ClearModified(); r_useHalfLambertLighting.ClearModified(); diff --git a/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp index b45e4a23..9abd45a4 100644 --- a/neo/renderer/RenderSystem_init.cpp +++ b/neo/renderer/RenderSystem_init.cpp @@ -391,8 +391,8 @@ static void R_CheckPortableExtensions() // 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 || - strcmp( glConfig.vendor_string, "X.Org" ) == 0 || - idStr::Icmpn( glConfig.renderer_string, "llvmpipe", 8 ) == 0 ) + strcmp( glConfig.vendor_string, "X.Org" ) == 0 || + idStr::Icmpn( glConfig.renderer_string, "llvmpipe", 8 ) == 0 ) { if( glConfig.driverType == GLDRV_OPENGL32_CORE_PROFILE ) { @@ -2792,9 +2792,9 @@ void idRenderSystemLocal::Init() guiModel = new( TAG_RENDER ) idGuiModel; guiModel->Clear(); tr_guiModel = guiModel; // for DeviceContext fast path - + UpdateStereo3DMode(); - + globalImages->Init(); // RB begin diff --git a/neo/renderer/tr_local.h b/neo/renderer/tr_local.h index 44183538..b9d682da 100644 --- a/neo/renderer/tr_local.h +++ b/neo/renderer/tr_local.h @@ -851,7 +851,7 @@ public: // internal functions idRenderSystemLocal(); ~idRenderSystemLocal(); - + void UpdateStereo3DMode(); void Clear();