diff options
| -rw-r--r-- | src/render/materialsystem/shaderbuilder.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp | 2 |
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; |