History

FetchSortCull->FetchCullSort

Zach Pomerantz committed 9 years ago

Commit 0e9da871 parent ca1a14e8 files · +32 −32Browse files

Showing the changes to interface/src/Application.cpp (1 of 8 files). Show all

Unified · Split

interface/src/Application.cpp+5−5
@@ -101,7 +101,7 @@ · 100 unmodified lines
101101 #include <RecordingScriptingInterface.h>
102102 #include <RenderableWebEntityItem.h>
103103 #include <RenderShadowTask.h>
104−#include <render/RenderFetchSortCullTask.h>
104+#include <render/RenderFetchCullSortTask.h>
105105 #include <RenderDeferredTask.h>
106106 #include <RenderForwardTask.h>
107107 #include <ResourceCache.h>
@@ -1819,13 +1819,13 @@ void Application::initializeGL() { · 1711 unmodified lines
18191819 // Set up the render engine
18201820 render::CullFunctor cullFunctor = LODManager::shouldRender;
18211821 _renderEngine->addJob<RenderShadowTask>("RenderShadowTask", cullFunctor);
1822− const auto items = _renderEngine->addJob<RenderFetchSortCullTask>("FetchSortCull", cullFunctor);
1823− assert(items.canCast<RenderFetchSortCullTask::Output>());
1822+ const auto items = _renderEngine->addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor);
1823+ assert(items.canCast<RenderFetchCullSortTask::Output>());
18241824 static const QString RENDER_FORWARD = "HIFI_RENDER_FORWARD";
18251825 if (QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD)) {
1826− _renderEngine->addJob<RenderForwardTask>("RenderForwardTask", items.get<RenderFetchSortCullTask::Output>());
1826+ _renderEngine->addJob<RenderForwardTask>("RenderForwardTask", items.get<RenderFetchCullSortTask::Output>());
18271827 } else {
1828− _renderEngine->addJob<RenderDeferredTask>("RenderDeferredTask", items.get<RenderFetchSortCullTask::Output>());
1828+ _renderEngine->addJob<RenderDeferredTask>("RenderDeferredTask", items.get<RenderFetchCullSortTask::Output>());
18291829 }
18301830 _renderEngine->load();
18311831 _renderEngine->registerScene(_main3DScene);