diff options
| author | Määttä Antti <antti.maatta@qt.io> | 2017-10-18 15:18:24 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2017-10-24 13:23:31 +0000 |
| commit | b02f4393e1ec66c2363fa353c20838d656412e19 (patch) | |
| tree | e3839648342b44c269735927440ae79ac66a114c /tests | |
| parent | 26b0743957b7fe8801ff822a86b52544de8a9426 (diff) | |
Rename more UIC to QT3DS
Task-number: QT3DS-18
Change-Id: I761edb7ea80124ede04e9f000075bec6b9412fe2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp | 10 | ||||
| -rw-r--r-- | tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp index 00d991d9..d857d1d2 100644 --- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp +++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp @@ -266,7 +266,7 @@ CustomTestParams *generateTest(qt3ds::render::CUICRendererImpl *renderImpl, } CRegisteredString lighting = - renderImpl->GetContext().GetStringTable().RegisterStr("UIC_ENABLE_CG_LIGHTING"); + renderImpl->GetContext().GetStringTable().RegisterStr("QT3DS_ENABLE_CG_LIGHTING"); params->features.push_back(SShaderPreprocessorFeature(lighting, key.lighting)); if (key.indirectLightmap) { @@ -319,7 +319,7 @@ CustomTestParams *generateTest(qt3ds::render::CUICRendererImpl *renderImpl, renderImpl->DefaultMaterialShaderKeyProperties().m_HasIbl.SetValue( params->shaderkey, true); CRegisteredString str(renderImpl->GetUICContext().GetStringTable() - .RegisterStr("UIC_ENABLE_LIGHT_PROBE")); + .RegisterStr("QT3DS_ENABLE_LIGHT_PROBE")); params->features.push_back(SShaderPreprocessorFeature(str, true)); params->material->m_IblProbe = ¶ms->iblLightProbe; @@ -351,17 +351,17 @@ CustomTestParams *generateTest(qt3ds::render::CUICRendererImpl *renderImpl, if (key.ssm) { CRegisteredString str(renderImpl->GetUICContext().GetStringTable() - .RegisterStr("UIC_ENABLE_SSM")); + .RegisterStr("QT3DS_ENABLE_SSM")); params->features.push_back(SShaderPreprocessorFeature(str, true)); } if (key.ssao) { CRegisteredString str(renderImpl->GetUICContext().GetStringTable() - .RegisterStr("UIC_ENABLE_SSAO")); + .RegisterStr("QT3DS_ENABLE_SSAO")); params->features.push_back(SShaderPreprocessorFeature(str, true)); } if (key.ssdo) { CRegisteredString str(renderImpl->GetUICContext().GetStringTable() - .RegisterStr("UIC_ENABLE_SSDO")); + .RegisterStr("QT3DS_ENABLE_SSDO")); params->features.push_back(SShaderPreprocessorFeature(str, true)); } diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp index 416fe9a3..20e785b3 100644 --- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp +++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp @@ -447,17 +447,17 @@ TestParams *generateTest(qt3ds::render::CUICRendererImpl *renderImpl, if (key.ssm) { CRegisteredString str(renderImpl->GetUICContext().GetStringTable() - .RegisterStr("UIC_ENABLE_SSM")); + .RegisterStr("QT3DS_ENABLE_SSM")); params->features.push_back(SShaderPreprocessorFeature(str, true)); } if (key.ssao) { CRegisteredString str(renderImpl->GetUICContext().GetStringTable() - .RegisterStr("UIC_ENABLE_SSAO")); + .RegisterStr("QT3DS_ENABLE_SSAO")); params->features.push_back(SShaderPreprocessorFeature(str, true)); } if (key.ssdo) { CRegisteredString str(renderImpl->GetUICContext().GetStringTable() - .RegisterStr("UIC_ENABLE_SSDO")); + .RegisterStr("QT3DS_ENABLE_SSDO")); params->features.push_back(SShaderPreprocessorFeature(str, true)); } @@ -465,11 +465,11 @@ TestParams *generateTest(qt3ds::render::CUICRendererImpl *renderImpl, renderImpl->DefaultMaterialShaderKeyProperties().m_HasIbl.SetValue( params->shaderkey, true); CRegisteredString str(renderImpl->GetUICContext().GetStringTable() - .RegisterStr("UIC_ENABLE_LIGHT_PROBE")); + .RegisterStr("QT3DS_ENABLE_LIGHT_PROBE")); params->features.push_back(SShaderPreprocessorFeature(str, true)); if (key.iblfow) { CRegisteredString str(renderImpl->GetUICContext().GetStringTable() - .RegisterStr("UIC_ENABLE_IBL_FOV")); + .RegisterStr("QT3DS_ENABLE_IBL_FOV")); params->features.push_back(SShaderPreprocessorFeature(str, true)); } } |