From 0d765008d0f15b886b1941b24bc46b23e811eaf3 Mon Sep 17 00:00:00 2001
From: s2s <12202580+standard-two-simplex@users.noreply.github.com>
Date: Mon, 17 Jan 2022 21:57:57 +0100
Subject: [PATCH] Do not apply shift scale to background textures.

Fixes issue with Command & Conquer described in #2617
---
 .../GLSL/glsl_CombinerProgramUniformFactoryAccurate.cpp      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.cpp
index c85e8736..92582654 100644
--- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.cpp
+++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.cpp
@@ -258,8 +258,6 @@ public:
 			aTexSize[t][0] = pTexture->width * pTexture->hdRatioS;
 			aTexSize[t][1] = pTexture->height * pTexture->hdRatioT;
 
-			aShiftScale[t][0] = calcShiftScaleS(*pTile);
-			aShiftScale[t][1] = calcShiftScaleT(*pTile);
 
 			if (pTile->textureMode != TEXTUREMODE_BGIMAGE && pTile->textureMode != TEXTUREMODE_FRAMEBUFFER_BG) {
 				float fuls = pTile->fuls;
@@ -277,6 +275,9 @@ public:
 				}
 				aTexOffset[t][0] = fuls;
 				aTexOffset[t][1] = fult;
+
+				aShiftScale[t][0] = calcShiftScaleS(*pTile);
+				aShiftScale[t][1] = calcShiftScaleT(*pTile);
 			}
 
 			aHDRatio[t][0] = pTexture->hdRatioS;