Fix disabling shader cache via environment variable

The tests were a broken too because the QT3D_DISABLE_SHADER_CACHE
environment var was still set from the previous test. These tests
passed before because the shader builder used the cache if either the
QT3D_DISABLE_SHADER_CACHE or QT3D_REBUILD_SHADER_CACHE are not set.

Change-Id: Ic04bf3bb8bb7b9b27e3dc9663fe5e96647a3bed4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit fd5c3299553818e99421f54c1b819681335de9aa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

2 files changed, 3 insertions, 1 deletions

diff --git a/src/render/materialsystem/shaderbuilder.cpp b/src/render/materialsystem/shaderbuilder.cpp
index 7837c7b75..04cb1bb5c 100644
--- a/src/render/materialsystem/shaderbuilder.cpp
+++ b/src/render/materialsystem/shaderbuilder.cpp
@@ -235,7 +235,7 @@ void ShaderBuilder::generateCode(QShaderProgram::ShaderType type)
 
     const QByteArray cacheKey = hashKeyForShaderGraph(type);
     const bool forceRegenerate = qEnvironmentVariableIsSet("QT3D_REBUILD_SHADER_CACHE");
-    const bool useCache = !qEnvironmentVariableIsSet("QT3D_DISABLE_SHADER_CACHE") || !forceRegenerate;
+    const bool useCache = !qEnvironmentVariableIsSet("QT3D_DISABLE_SHADER_CACHE") && !forceRegenerate;
     const QByteArray userProvidedPath = qgetenv("QT3D_WRITABLE_CACHE_PATH");
     const QString cachedFilterPath = QDir(userProvidedPath.isEmpty() ?
                                               QStandardPaths::writableLocation(QStandardPaths::TempLocation)
diff --git a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
index 9ce63b406..3e3fdd4f9 100644
--- a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
+++ b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
@@ -609,6 +609,7 @@ private slots:
     void checkFileCaching()
     {
         // GIVEN
+        qunsetenv("QT3D_DISABLE_SHADER_CACHE");
         QTemporaryDir cacheDir;
 
         if (!cacheDir.isValid()) {
@@ -685,6 +686,7 @@ private slots:
     void checkRuntimeCaching()
     {
         // GIVEN
+        qunsetenv("QT3D_DISABLE_SHADER_CACHE");
         TestRenderer renderer;
         QTemporaryDir cacheDir;