Showing the changes to libraries/render-utils/src/RenderViewTask.cpp (1 of 81 files). Show all
Unified · Split
| @@ -15,7 +15,7 @@ · 14 unmodified lines | |||
| 15 | #include "RenderDeferredTask.h" | 15 | #include "RenderDeferredTask.h" |
| 16 | #include "RenderForwardTask.h" | 16 | #include "RenderForwardTask.h" |
| 17 | 17 | ||
| 18 | void RenderShadowsAndDeferredTask::build(JobModel& task, const render::Varying& input, render::Varying& output, render::CullFunctor cullFunctor, uint8_t tagBits, uint8_t tagMask) { | 18 | void RenderShadowsAndDeferredTask::build(JobModel& task, const render::Varying& input, render::Varying& output, render::CullFunctor cullFunctor, uint8_t tagBits, uint8_t tagMask, size_t depth) { |
| 19 | task.addJob<SetRenderMethod>("SetRenderMethodTask", render::Args::DEFERRED); | 19 | task.addJob<SetRenderMethod>("SetRenderMethodTask", render::Args::DEFERRED); |
| 20 | 20 | ||
| 21 | const auto items = input.getN<DeferredForwardSwitchJob::Input>(0); | 21 | const auto items = input.getN<DeferredForwardSwitchJob::Input>(0); |
| @@ -28,16 +28,16 @@ void RenderShadowsAndDeferredTask::build(JobModel& task, const render::Varying& · 6 unmodified lines | |||
| 28 | const auto shadowTaskOut = task.addJob<RenderShadowTask>("RenderShadowTask", shadowTaskIn, cullFunctor, tagBits, tagMask); | 28 | const auto shadowTaskOut = task.addJob<RenderShadowTask>("RenderShadowTask", shadowTaskIn, cullFunctor, tagBits, tagMask); |
| 29 | 29 | ||
| 30 | const auto renderDeferredInput = RenderDeferredTask::Input(items, lightingModel, lightingStageFramesAndZones, shadowTaskOut).asVarying(); | 30 | const auto renderDeferredInput = RenderDeferredTask::Input(items, lightingModel, lightingStageFramesAndZones, shadowTaskOut).asVarying(); |
| 31 | task.addJob<RenderDeferredTask>("RenderDeferredTask", renderDeferredInput); | 31 | task.addJob<RenderDeferredTask>("RenderDeferredTask", renderDeferredInput, cullFunctor, depth); |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | void DeferredForwardSwitchJob::build(JobModel& task, const render::Varying& input, render::Varying& output, render::CullFunctor cullFunctor, uint8_t tagBits, uint8_t tagMask) { | 34 | void DeferredForwardSwitchJob::build(JobModel& task, const render::Varying& input, render::Varying& output, render::CullFunctor cullFunctor, uint8_t tagBits, uint8_t tagMask, size_t depth) { |
| 35 | task.addBranch<RenderShadowsAndDeferredTask>("RenderShadowsAndDeferredTask", 0, input, cullFunctor, tagBits, tagMask); | 35 | task.addBranch<RenderShadowsAndDeferredTask>("RenderShadowsAndDeferredTask", 0, input, cullFunctor, tagBits, tagMask, depth); |
| 36 | 36 | ||
| 37 | task.addBranch<RenderForwardTask>("RenderForwardTask", 1, input); | 37 | task.addBranch<RenderForwardTask>("RenderForwardTask", 1, input, cullFunctor, depth); |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | void RenderViewTask::build(JobModel& task, const render::Varying& input, render::Varying& output, render::CullFunctor cullFunctor, uint8_t tagBits, uint8_t tagMask) { | 40 | void RenderViewTask::build(JobModel& task, const render::Varying& input, render::Varying& output, render::CullFunctor cullFunctor, uint8_t tagBits, uint8_t tagMask, size_t depth) { |
| 41 | const auto items = task.addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor, tagBits, tagMask); | 41 | const auto items = task.addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor, tagBits, tagMask); |
| 42 | 42 | ||
| 43 | // Issue the lighting model, aka the big global settings for the view | 43 | // Issue the lighting model, aka the big global settings for the view |
| @@ -48,7 +48,7 @@ void RenderViewTask::build(JobModel& task, const render::Varying& input, render: · 4 unmodified lines | |||
| 48 | 48 | ||
| 49 | #ifndef Q_OS_ANDROID | 49 | #ifndef Q_OS_ANDROID |
| 50 | const auto deferredForwardIn = DeferredForwardSwitchJob::Input(items, lightingModel, lightingStageFramesAndZones).asVarying(); | 50 | const auto deferredForwardIn = DeferredForwardSwitchJob::Input(items, lightingModel, lightingStageFramesAndZones).asVarying(); |
| 51 | task.addJob<DeferredForwardSwitchJob>("DeferredForwardSwitch", deferredForwardIn, cullFunctor, tagBits, tagMask); | 51 | task.addJob<DeferredForwardSwitchJob>("DeferredForwardSwitch", deferredForwardIn, cullFunctor, tagBits, tagMask, depth); |
| 52 | #else | 52 | #else |
| 53 | const auto renderInput = RenderForwardTask::Input(items, lightingModel, lightingStageFramesAndZones).asVarying(); | 53 | const auto renderInput = RenderForwardTask::Input(items, lightingModel, lightingStageFramesAndZones).asVarying(); |
| 54 | task.addJob<RenderForwardTask>("RenderForwardTask", renderInput); | 54 | task.addJob<RenderForwardTask>("RenderForwardTask", renderInput); |