Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all
Unified · Split
| @@ -97,6 +97,7 @@ · 96 unmodified lines | ||
| 97 | 97 | #include <RenderableWebEntityItem.h> |
| 98 | 98 | #include <RenderShadowTask.h> |
| 99 | 99 | #include <RenderDeferredTask.h> |
| 100 | +#include <RenderForwardTask.h> | |
| 100 | 101 | #include <ResourceCache.h> |
| 101 | 102 | #include <SandboxUtils.h> |
| 102 | 103 | #include <SceneScriptingInterface.h> |
| @@ -1739,10 +1740,14 @@ void Application::initializeGL() { · 1636 unmodified lines | ||
| 1739 | 1740 | // Set up the render engine |
| 1740 | 1741 | render::CullFunctor cullFunctor = LODManager::shouldRender; |
| 1741 | 1742 | _renderEngine->addJob<RenderShadowTask>("RenderShadowTask", cullFunctor); |
| 1742 | − _renderEngine->addJob<RenderDeferredTask>("RenderDeferredTask", cullFunctor); | |
| 1743 | + static const QString RENDER_FORWARD = "RENDER_FORWARD"; | |
| 1744 | + if (QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD)) { | |
| 1745 | + _renderEngine->addJob<RenderForwardTask>("RenderForwardTask", cullFunctor); | |
| 1746 | + } else { | |
| 1747 | + _renderEngine->addJob<RenderDeferredTask>("RenderDeferredTask", cullFunctor); | |
| 1748 | + } | |
| 1743 | 1749 | _renderEngine->load(); |
| 1744 | 1750 | _renderEngine->registerScene(_main3DScene); |
| 1745 | − // TODO: Load a cached config file | |
| 1746 | 1751 | |
| 1747 | 1752 | // The UI can't be created until the primary OpenGL |
| 1748 | 1753 | // context is created, because it needs to share |