From 3bbd40bc8c01af7f6fc9ad25dcb8cbce465961ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A4=C3=A4tt=C3=A4=20Antti?= <antti.maatta@qt.io>
Date: Thu, 1 Feb 2018 14:46:56 +0200
Subject: Fix custom material autotests with light probes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QT3DS_ENABLE_LIGHT_PROBE needs to be set even when it is disabled

Change-Id: I5ccbcf6863ed71ad46af8d765e228f5c81d19cb4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
---
 .../shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp        | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp
index c4115377..a071fb82 100644
--- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp
+++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp
@@ -327,6 +327,10 @@ CustomTestParams *generateTest(qt3ds::render::Qt3DSRendererImpl *renderImpl,
         NVDataRef<QT3DSU8> buffer = toU8DataRef<unsigned int>(data);
         params->texture->SetTextureData(buffer, 0, 1, 1, format);
         params->iblLightProbe.m_TextureData.m_Texture = params->texture;
+    } else {
+        CRegisteredString str(renderImpl->GetQt3DSContext().GetStringTable()
+                              .RegisterStr("QT3DS_ENABLE_LIGHT_PROBE"));
+        params->features.push_back(SShaderPreprocessorFeature(str, false));
     }
 
     // these requires calculateGlass function in material
-- 
cgit v1.2.3