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

View file

@ -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;

View file

@ -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 )

View file

@ -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();

View file

@ -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

View file

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