Showing the changes to interface/src/Application.cpp (1 of 8 files). Show all
Unified · Split
| @@ -101,7 +101,7 @@ · 100 unmodified lines | |||
| 101 | #include <RecordingScriptingInterface.h> | 101 | #include <RecordingScriptingInterface.h> |
| 102 | #include <RenderableWebEntityItem.h> | 102 | #include <RenderableWebEntityItem.h> |
| 103 | #include <RenderShadowTask.h> | 103 | #include <RenderShadowTask.h> |
| 104 | #include <render/RenderFetchSortCullTask.h> | 104 | #include <render/RenderFetchCullSortTask.h> |
| 105 | #include <RenderDeferredTask.h> | 105 | #include <RenderDeferredTask.h> |
| 106 | #include <RenderForwardTask.h> | 106 | #include <RenderForwardTask.h> |
| 107 | #include <ResourceCache.h> | 107 | #include <ResourceCache.h> |
| @@ -1819,13 +1819,13 @@ void Application::initializeGL() { · 1711 unmodified lines | |||
| 1819 | // Set up the render engine | 1819 | // Set up the render engine |
| 1820 | render::CullFunctor cullFunctor = LODManager::shouldRender; | 1820 | render::CullFunctor cullFunctor = LODManager::shouldRender; |
| 1821 | _renderEngine->addJob<RenderShadowTask>("RenderShadowTask", cullFunctor); | 1821 | _renderEngine->addJob<RenderShadowTask>("RenderShadowTask", cullFunctor); |
| 1822 | const auto items = _renderEngine->addJob<RenderFetchSortCullTask>("FetchSortCull", cullFunctor); | 1822 | const auto items = _renderEngine->addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor); |
| 1823 | assert(items.canCast<RenderFetchSortCullTask::Output>()); | 1823 | assert(items.canCast<RenderFetchCullSortTask::Output>()); |
| 1824 | static const QString RENDER_FORWARD = "HIFI_RENDER_FORWARD"; | 1824 | static const QString RENDER_FORWARD = "HIFI_RENDER_FORWARD"; |
| 1825 | if (QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD)) { | 1825 | if (QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD)) { |
| 1826 | _renderEngine->addJob<RenderForwardTask>("RenderForwardTask", items.get<RenderFetchSortCullTask::Output>()); | 1826 | _renderEngine->addJob<RenderForwardTask>("RenderForwardTask", items.get<RenderFetchCullSortTask::Output>()); |
| 1827 | } else { | 1827 | } else { |
| 1828 | _renderEngine->addJob<RenderDeferredTask>("RenderDeferredTask", items.get<RenderFetchSortCullTask::Output>()); | 1828 | _renderEngine->addJob<RenderDeferredTask>("RenderDeferredTask", items.get<RenderFetchCullSortTask::Output>()); |
| 1829 | } | 1829 | } |
| 1830 | _renderEngine->load(); | 1830 | _renderEngine->load(); |
| 1831 | _renderEngine->registerScene(_main3DScene); | 1831 | _renderEngine->registerScene(_main3DScene); |