Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 22:35:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

FetchSortCull->FetchCullSort

Browse source
This commit is contained in:
Zach Pomerantz 2016-12-29 19:20:15 -05:00
parent ca1a14e5b0
commit 0e9da87549
8 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Application.cpp
View file

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

2
libraries/render-utils/src/RenderDeferredTask.cpp
View file

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

16
libraries/render-utils/src/RenderDeferredTask.h
View file

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

2
libraries/render-utils/src/RenderForwardTask.cpp
View file

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

4
libraries/render-utils/src/RenderForwardTask.h
View file

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

6
libraries/render/src/render/RenderFetchSortCullTask.cpp → libraries/render/src/render/RenderFetchCullSortTask.cpp
View file

@ -1,5 +1,5 @@
// //
// RenderFetchSortCullTask.cpp // RenderFetchCullSortTask.cpp
// render/src/ // render/src/
// //
// Created by Zach Pomerantz on 12/22/2016. // 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 // 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 "CullTask.h"
#include "SortTask.h" #include "SortTask.h"
using namespace render; using namespace render;
RenderFetchSortCullTask::RenderFetchSortCullTask(CullFunctor cullFunctor) { RenderFetchCullSortTask::RenderFetchCullSortTask(CullFunctor cullFunctor) {
cullFunctor = cullFunctor ? cullFunctor : [](const RenderArgs*, const AABox&){ return true; }; cullFunctor = cullFunctor ? cullFunctor : [](const RenderArgs*, const AABox&){ return true; };
// CPU jobs: // CPU jobs:

14
libraries/render/src/render/RenderFetchSortCullTask.h → libraries/render/src/render/RenderFetchCullSortTask.h
View file

@ -1,5 +1,5 @@
// //
// RenderFetchSortCullTask.h // RenderFetchCullSortTask.h
// render/src/ // render/src/
// //
// Created by Zach Pomerantz on 12/22/2016. // 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 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#ifndef hifi_RenderFetchSortCullTask_h #ifndef hifi_RenderFetchCullSortTask_h
#define hifi_RenderFetchSortCullTask_h #define hifi_RenderFetchCullSortTask_h
#include <gpu/Pipeline.h> #include <gpu/Pipeline.h>
#include "Task.h" #include "Task.h"
#include "CullTask.h" #include "CullTask.h"
class RenderFetchSortCullTask : public render::Task { class RenderFetchCullSortTask : public render::Task {
public: public:
using Output = std::array<render::Varying, 6>; 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

10
tests/render-perf/src/main.cpp
View file

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