From 0e9da875491be8fc6d04df91fc9bab234f28fa3c Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Thu, 29 Dec 2016 19:20:15 -0500 Subject: [PATCH] FetchSortCull->FetchCullSort --- interface/src/Application.cpp | 10 +++++----- .../render-utils/src/RenderDeferredTask.cpp | 2 +- libraries/render-utils/src/RenderDeferredTask.h | 16 ++++++++-------- libraries/render-utils/src/RenderForwardTask.cpp | 2 +- libraries/render-utils/src/RenderForwardTask.h | 4 ++-- ...tCullTask.cpp => RenderFetchCullSortTask.cpp} | 6 +++--- ...hSortCullTask.h => RenderFetchCullSortTask.h} | 14 +++++++------- tests/render-perf/src/main.cpp | 10 +++++----- 8 files changed, 32 insertions(+), 32 deletions(-) rename libraries/render/src/render/{RenderFetchSortCullTask.cpp => RenderFetchCullSortTask.cpp} (95%) rename libraries/render/src/render/{RenderFetchSortCullTask.h => RenderFetchCullSortTask.h} (55%) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 81053a708c..ed2f48d521 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -101,7 +101,7 @@ #include #include #include -#include +#include #include #include #include @@ -1819,13 +1819,13 @@ void Application::initializeGL() { // Set up the render engine render::CullFunctor cullFunctor = LODManager::shouldRender; _renderEngine->addJob("RenderShadowTask", cullFunctor); - const auto items = _renderEngine->addJob("FetchSortCull", cullFunctor); - assert(items.canCast()); + const auto items = _renderEngine->addJob("FetchCullSort", cullFunctor); + assert(items.canCast()); static const QString RENDER_FORWARD = "HIFI_RENDER_FORWARD"; if (QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD)) { - _renderEngine->addJob("RenderForwardTask", items.get()); + _renderEngine->addJob("RenderForwardTask", items.get()); } else { - _renderEngine->addJob("RenderDeferredTask", items.get()); + _renderEngine->addJob("RenderDeferredTask", items.get()); } _renderEngine->load(); _renderEngine->registerScene(_main3DScene); diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp index 4a99795a70..1c1b760f04 100644 --- a/libraries/render-utils/src/RenderDeferredTask.cpp +++ b/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(); initDeferredPipelines(*shapePlumber); diff --git a/libraries/render-utils/src/RenderDeferredTask.h b/libraries/render-utils/src/RenderDeferredTask.h index a52741f2a3..8a95447e67 100644 --- a/libraries/render-utils/src/RenderDeferredTask.h +++ b/libraries/render-utils/src/RenderDeferredTask.h @@ -13,18 +13,18 @@ #define hifi_RenderDeferredTask_h #include -#include +#include #include "LightingModel.h" class BeginGPURangeTimer { public: using JobModel = render::Job::ModelO; - + BeginGPURangeTimer(const std::string& name) : _gpuTimer(std::make_shared(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() {} - + 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(RenderFetchSortCullTask::Output items); + RenderDeferredTask(RenderFetchCullSortTask::Output items); }; #endif // hifi_RenderDeferredTask_h diff --git a/libraries/render-utils/src/RenderForwardTask.cpp b/libraries/render-utils/src/RenderForwardTask.cpp index 2d96dc2e38..c3e5fec7e9 100755 --- a/libraries/render-utils/src/RenderForwardTask.cpp +++ b/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(); initDeferredPipelines(*shapePlumber); diff --git a/libraries/render-utils/src/RenderForwardTask.h b/libraries/render-utils/src/RenderForwardTask.h index 8615ecbec3..c653f27e3c 100755 --- a/libraries/render-utils/src/RenderForwardTask.h +++ b/libraries/render-utils/src/RenderForwardTask.h @@ -13,14 +13,14 @@ #define hifi_RenderForwardTask_h #include -#include +#include #include "LightingModel.h" class RenderForwardTask : public render::Task { public: using JobModel = Model; - RenderForwardTask(RenderFetchSortCullTask::Output items); + RenderForwardTask(RenderFetchCullSortTask::Output items); }; class PrepareFramebuffer { diff --git a/libraries/render/src/render/RenderFetchSortCullTask.cpp b/libraries/render/src/render/RenderFetchCullSortTask.cpp similarity index 95% rename from libraries/render/src/render/RenderFetchSortCullTask.cpp rename to libraries/render/src/render/RenderFetchCullSortTask.cpp index 43066e4f1b..40d8e84568 100644 --- a/libraries/render/src/render/RenderFetchSortCullTask.cpp +++ b/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: diff --git a/libraries/render/src/render/RenderFetchSortCullTask.h b/libraries/render/src/render/RenderFetchCullSortTask.h similarity index 55% rename from libraries/render/src/render/RenderFetchSortCullTask.h rename to libraries/render/src/render/RenderFetchCullSortTask.h index 17d9f1a005..1f8c5e83c5 100644 --- a/libraries/render/src/render/RenderFetchSortCullTask.h +++ b/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 #include "Task.h" #include "CullTask.h" -class RenderFetchSortCullTask : public render::Task { +class RenderFetchCullSortTask : public render::Task { public: using Output = std::array; - using JobModel = ModelO; + using JobModel = ModelO; - RenderFetchSortCullTask(render::CullFunctor cullFunctor); + RenderFetchCullSortTask(render::CullFunctor cullFunctor); }; -#endif // hifi_RenderFetchSortCullTask_h +#endif // hifi_RenderFetchCullSortTask_h diff --git a/tests/render-perf/src/main.cpp b/tests/render-perf/src/main.cpp index 3f6d8b29b0..324e440799 100644 --- a/tests/render-perf/src/main.cpp +++ b/tests/render-perf/src/main.cpp @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include @@ -536,13 +536,13 @@ public: _initContext.makeCurrent(); // Render engine init _renderEngine->addJob("RenderShadowTask", _cullFunctor); - const auto items = _renderEngine->addJob("FetchSortCull", _cullFunctor); - assert(items.canCast()); + const auto items = _renderEngine->addJob("FetchCullSort", _cullFunctor); + assert(items.canCast()); static const QString RENDER_FORWARD = "HIFI_RENDER_FORWARD"; if (QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD)) { - _renderEngine->addJob("RenderForwardTask", items.get()); + _renderEngine->addJob("RenderForwardTask", items.get()); } else { - _renderEngine->addJob("RenderDeferredTask", items.get()); + _renderEngine->addJob("RenderDeferredTask", items.get()); } _renderEngine->load(); _renderEngine->registerScene(_main3DScene);