3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-30 16:23:15 +02:00

threadsafe setRenderMethod

This commit is contained in:
SamGondelman 2019-05-16 16:14:56 -07:00
parent 451c52fa47
commit db813fab6a
2 changed files with 6 additions and 7 deletions

View file

@ -24,6 +24,11 @@ QString RenderScriptingInterface::getRenderMethod() {
}
void RenderScriptingInterface::setRenderMethod(const QString& renderMethod) {
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "setRenderMethod", Q_ARG(const QString&, renderMethod));
return;
}
auto config = dynamic_cast<task::SwitchConfig*>(qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.DeferredForwardSwitch"));
if (config) {
if (renderMethod == DEFERRED) {

View file

@ -59,13 +59,7 @@ public slots:
void setRenderMethod(const QString& renderMethod);
private:
Setting::Handle<int> _renderMethodSetting { "renderMethod",
#ifdef RENDER_FORWARD
render::Args::RenderMethod::FORWARD
#else
render::Args::RenderMethod::DEFERRED
#endif
};
Setting::Handle<int> _renderMethodSetting { "renderMethod", RENDER_FORWARD ? render::Args::RenderMethod::FORWARD : render::Args::RenderMethod::DEFERRED };
};
#endif // hifi_RenderScriptingInterface_h