FetchSortCull->FetchCullSort

interface/src/Application.cpp

@@ -101,7 +101,7 @@
 #include <RecordingScriptingInterface.h>
 #include <RenderableWebEntityItem.h>
 #include <RenderShadowTask.h>
-#include <render/RenderFetchSortCullTask.h>
+#include <render/RenderFetchCullSortTask.h>
 #include <RenderDeferredTask.h>
 #include <RenderForwardTask.h>
 #include <ResourceCache.h>
@@ -1819,13 +1819,13 @@ void Application::initializeGL() {
     // Set up the render engine
     render::CullFunctor cullFunctor = LODManager::shouldRender;
     _renderEngine->addJob<RenderShadowTask>("RenderShadowTask", cullFunctor);
-    const auto items = _renderEngine->addJob<RenderFetchSortCullTask>("FetchSortCull", cullFunctor);
-    assert(items.canCast<RenderFetchSortCullTask::Output>());
+    const auto items = _renderEngine->addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor);
+    assert(items.canCast<RenderFetchCullSortTask::Output>());
     static const QString RENDER_FORWARD = "HIFI_RENDER_FORWARD";
     if (QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD)) {
-        _renderEngine->addJob<RenderForwardTask>("RenderForwardTask", items.get<RenderFetchSortCullTask::Output>());
+        _renderEngine->addJob<RenderForwardTask>("RenderForwardTask", items.get<RenderFetchCullSortTask::Output>());
     } else {
-        _renderEngine->addJob<RenderDeferredTask>("RenderDeferredTask", items.get<RenderFetchSortCullTask::Output>());
+        _renderEngine->addJob<RenderDeferredTask>("RenderDeferredTask", items.get<RenderFetchCullSortTask::Output>());
     }
     _renderEngine->load();
     _renderEngine->registerScene(_main3DScene);

libraries/render-utils/src/RenderDeferredTask.cpp

@@ -48,7 +48,7 @@ using namespace render;
 extern void initOverlay3DPipelines(render::ShapePlumber& plumber);
 extern void initDeferredPipelines(render::ShapePlumber& plumber);
 
-RenderDeferredTask::RenderDeferredTask(RenderFetchSortCullTask::Output items) {
+RenderDeferredTask::RenderDeferredTask(RenderFetchCullSortTask::Output items) {
     // Prepare the ShapePipelines
     ShapePlumberPointer shapePlumber = std::make_shared<ShapePlumber>();
     initDeferredPipelines(*shapePlumber);

libraries/render-utils/src/RenderDeferredTask.h

@@ -13,18 +13,18 @@
 #define hifi_RenderDeferredTask_h
 
 #include <gpu/Pipeline.h>
-#include <render/RenderFetchSortCullTask.h>
+#include <render/RenderFetchCullSortTask.h>
 #include "LightingModel.h"
 
 
 class BeginGPURangeTimer {
 public:
     using JobModel = render::Job::ModelO<BeginGPURangeTimer, gpu::RangeTimerPointer>;
-    
+
     BeginGPURangeTimer(const std::string& name) : _gpuTimer(std::make_shared<gpu::RangeTimer>(name)) {}
-    
+
     void run(const render::SceneContextPointer& sceneContext, const render::RenderContextPointer& renderContext, gpu::RangeTimerPointer& timer);
-    
+
 protected:
     gpu::RangeTimerPointer _gpuTimer;
 };
@@ -35,12 +35,12 @@ class EndGPURangeTimer {
 public:
     using Config = GPURangeTimerConfig;
     using JobModel = render::Job::ModelI<EndGPURangeTimer, gpu::RangeTimerPointer, Config>;
-    
+
     EndGPURangeTimer() {}
-    
+
     void configure(const Config& config) {}
     void run(const render::SceneContextPointer& sceneContext, const render::RenderContextPointer& renderContext, const gpu::RangeTimerPointer& timer);
-    
+
 protected:
 };
 
@@ -196,7 +196,7 @@ class RenderDeferredTask : public render::Task {
 public:
     using JobModel = Model<RenderDeferredTask>;
 
-    RenderDeferredTask(RenderFetchSortCullTask::Output items);
+    RenderDeferredTask(RenderFetchCullSortTask::Output items);
 };
 
 #endif // hifi_RenderDeferredTask_h

libraries/render-utils/src/RenderForwardTask.cpp

@@ -31,7 +31,7 @@ using namespace render;
 extern void initOverlay3DPipelines(render::ShapePlumber& plumber);
 extern void initDeferredPipelines(render::ShapePlumber& plumber);
 
-RenderForwardTask::RenderForwardTask(RenderFetchSortCullTask::Output items) {
+RenderForwardTask::RenderForwardTask(RenderFetchCullSortTask::Output items) {
     // Prepare the ShapePipelines
     ShapePlumberPointer shapePlumber = std::make_shared<ShapePlumber>();
     initDeferredPipelines(*shapePlumber);

libraries/render-utils/src/RenderForwardTask.h

@@ -13,14 +13,14 @@
 #define hifi_RenderForwardTask_h
 
 #include <gpu/Pipeline.h>
-#include <render/RenderFetchSortCullTask.h>
+#include <render/RenderFetchCullSortTask.h>
 #include "LightingModel.h"
 
 class RenderForwardTask : public render::Task {
 public:
     using JobModel = Model<RenderForwardTask>;
 
-    RenderForwardTask(RenderFetchSortCullTask::Output items);
+    RenderForwardTask(RenderFetchCullSortTask::Output items);
 };
 
 class PrepareFramebuffer {

libraries/render/src/render/RenderFetchCullSortTask.cpp

@@ -1,5 +1,5 @@
 //
-//  RenderFetchSortCullTask.cpp
+//  RenderFetchCullSortTask.cpp
 //  render/src/
 //
 //  Created by Zach Pomerantz on 12/22/2016.
@@ -9,14 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "RenderFetchSortCullTask.h"
+#include "RenderFetchCullSortTask.h"
 
 #include "CullTask.h"
 #include "SortTask.h"
 
 using namespace render;
 
-RenderFetchSortCullTask::RenderFetchSortCullTask(CullFunctor cullFunctor) {
+RenderFetchCullSortTask::RenderFetchCullSortTask(CullFunctor cullFunctor) {
     cullFunctor = cullFunctor ? cullFunctor : [](const RenderArgs*, const AABox&){ return true; };
 
     // CPU jobs:

libraries/render/src/render/RenderFetchCullSortTask.h

@@ -1,5 +1,5 @@
 //
-//  RenderFetchSortCullTask.h
+//  RenderFetchCullSortTask.h
 //  render/src/
 //
 //  Created by Zach Pomerantz on 12/22/2016.
@@ -9,20 +9,20 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef hifi_RenderFetchSortCullTask_h
-#define hifi_RenderFetchSortCullTask_h
+#ifndef hifi_RenderFetchCullSortTask_h
+#define hifi_RenderFetchCullSortTask_h
 
 #include <gpu/Pipeline.h>
 
 #include "Task.h"
 #include "CullTask.h"
 
-class RenderFetchSortCullTask : public render::Task {
+class RenderFetchCullSortTask : public render::Task {
 public:
     using Output = std::array<render::Varying, 6>;
-    using JobModel = ModelO<RenderFetchSortCullTask>;
+    using JobModel = ModelO<RenderFetchCullSortTask>;
 
-    RenderFetchSortCullTask(render::CullFunctor cullFunctor);
+    RenderFetchCullSortTask(render::CullFunctor cullFunctor);
 };
 
-#endif // hifi_RenderFetchSortCullTask_h
+#endif // hifi_RenderFetchCullSortTask_h

tests/render-perf/src/main.cpp

@@ -59,7 +59,7 @@
 #include <model-networking/ModelCache.h>
 #include <GeometryCache.h>
 #include <DeferredLightingEffect.h>
-#include <render/RenderFetchSortCullTask.h>
+#include <render/RenderFetchCullSortTask.h>
 #include <RenderShadowTask.h>
 #include <RenderDeferredTask.h>
 #include <RenderForwardTask.h>
@@ -536,13 +536,13 @@ public:
         _initContext.makeCurrent();
         // Render engine init
         _renderEngine->addJob<RenderShadowTask>("RenderShadowTask", _cullFunctor);
-        const auto items = _renderEngine->addJob<RenderFetchSortCullTask>("FetchSortCull", _cullFunctor);
-        assert(items.canCast<RenderFetchSortCullTask::Output>());
+        const auto items = _renderEngine->addJob<RenderFetchCullSortTask>("FetchCullSort", _cullFunctor);
+        assert(items.canCast<RenderFetchCullSortTask::Output>());
         static const QString RENDER_FORWARD = "HIFI_RENDER_FORWARD";
         if (QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD)) {
-            _renderEngine->addJob<RenderForwardTask>("RenderForwardTask", items.get<RenderFetchSortCullTask::Output>());
+            _renderEngine->addJob<RenderForwardTask>("RenderForwardTask", items.get<RenderFetchCullSortTask::Output>());
         } else {
-            _renderEngine->addJob<RenderDeferredTask>("RenderDeferredTask", items.get<RenderFetchSortCullTask::Output>());
+            _renderEngine->addJob<RenderDeferredTask>("RenderDeferredTask", items.get<RenderFetchCullSortTask::Output>());
         }
         _renderEngine->load();
         _renderEngine->registerScene(_main3DScene);