Merge remote-tracking branch 'rlva/development' into rlva/development

meow-7.2.2
Kitty Barnett 2021-07-21 16:36:59 +02:00
commit 779737f6ab
1 changed files with 10 additions and 5 deletions

View File

@ -779,19 +779,24 @@ void LLPipeline::resizeScreenTexture()
GLuint resY = gViewerWindow->getWorldViewHeightRaw();
// [SL:KB] - Patch: Settings-RenderResolutionMultiplier | Checked: Catznip-5.4
GLuint scaledResX = resX;
GLuint scaledResY = resY;
if ( (RenderResolutionDivisor > 1) && (RenderResolutionDivisor < resX) && (RenderResolutionDivisor < resY) )
{
resX /= RenderResolutionDivisor;
resY /= RenderResolutionDivisor;
scaledResX /= RenderResolutionDivisor;
scaledResY /= RenderResolutionDivisor;
}
else if (RenderResolutionMultiplier != 1.f)
{
resX *= RenderResolutionMultiplier;
resY *= RenderResolutionMultiplier;
scaledResX *= RenderResolutionMultiplier;
scaledResY *= RenderResolutionMultiplier;
}
// [/SL:KB]
if (gResizeScreenTexture || (resX != mScreen.getWidth()) || (resY != mScreen.getHeight()))
// if (gResizeScreenTexture || (resX != mScreen.getWidth()) || (resY != mScreen.getHeight()))
// [SL:KB] - Patch: Settings-RenderResolutionMultiplier | Checked: Catznip-5.4
if (gResizeScreenTexture || (scaledResX != mScreen.getWidth()) || (scaledResY != mScreen.getHeight()))
// [/SL:KB]
{
releaseScreenBuffers();
releaseShadowTargets();