From 28d36c81e0ed774e3da9a7be0dcc2e9b09fc9c39 Mon Sep 17 00:00:00 2001 From: sam gateau Date: Fri, 7 Dec 2018 16:24:51 -0800 Subject: [PATCH] there and back , trying to converge with the new Assemble Lighting Stage task --- .../render-utils/src/RenderDeferredTask.cpp | 5 +- .../render-utils/src/RenderForwardTask.cpp | 4 +- libraries/task/src/task/Task.cpp | 2 - libraries/task/src/task/Varying.h | 72 ++----------------- 4 files changed, 8 insertions(+), 75 deletions(-) diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp index c1b72c9ca6..223efbeba4 100644 --- a/libraries/render-utils/src/RenderDeferredTask.cpp +++ b/libraries/render-utils/src/RenderDeferredTask.cpp @@ -152,10 +152,9 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren const auto& spatialSelection = fetchedItems[1]; // Extract the Lighting Stages Current frame ( and zones) - //const auto lightingStageInputs = inputs[1]; - const auto lightingStageInputs = input[1]; + const auto lightingStageInputs = inputs.get1(); // Fetch the current frame stacks from all the stages - const auto currentStageFrames = lightingStageInputs[0]; + const auto currentStageFrames = lightingStageInputs.get0(); const auto lightFrame = currentStageFrames[0]; const auto backgroundFrame = currentStageFrames[1]; const auto& hazeFrame = currentStageFrames[2]; diff --git a/libraries/render-utils/src/RenderForwardTask.cpp b/libraries/render-utils/src/RenderForwardTask.cpp index fb29f026e2..31e22f00d5 100755 --- a/libraries/render-utils/src/RenderForwardTask.cpp +++ b/libraries/render-utils/src/RenderForwardTask.cpp @@ -55,9 +55,9 @@ void RenderForwardTask::build(JobModel& task, const render::Varying& input, rend const auto& items = fetchedItems.get0(); - const auto& lightingStageInputs = inputs[1]; + const auto& lightingStageInputs = inputs.get1(); // Fetch the current frame stacks from all the stages - const auto& currentStageFrames = lightingStageInputs[0]; + const auto& currentStageFrames = lightingStageInputs.get0(); const auto& lightFrame = currentStageFrames[0]; const auto& backgroundFrame = currentStageFrames[1]; const auto& hazeFrame = currentStageFrames[2]; diff --git a/libraries/task/src/task/Task.cpp b/libraries/task/src/task/Task.cpp index 9123ef8b04..2d6493fbc5 100644 --- a/libraries/task/src/task/Task.cpp +++ b/libraries/task/src/task/Task.cpp @@ -29,5 +29,3 @@ void TaskFlow::abortTask() { bool TaskFlow::doAbortTask() const { return _doAbortTask; } - - diff --git a/libraries/task/src/task/Varying.h b/libraries/task/src/task/Varying.h index 10c894c72f..c81d8b6753 100644 --- a/libraries/task/src/task/Varying.h +++ b/libraries/task/src/task/Varying.h @@ -19,13 +19,6 @@ namespace task { class Varying; -template Varying varyingGetSub(const T& data, uint8_t index) { - return Varying(); -} - -template uint8_t varyingGetLength(const T& data) { - return 0; -} // A varying piece of data, to be used as Job/Task I/O class Varying { @@ -75,10 +68,10 @@ protected: virtual ~Model() = default; virtual Varying operator[] (uint8_t index) const override { - return varyingGetSub(_data, index); + return Varying(); } virtual uint8_t length() const override { - return varyingGetLength(_data); + return 0; } Data _data; @@ -87,11 +80,10 @@ protected: std::shared_ptr _concept; }; -using VaryingPairBase = std::pair; template < typename T0, typename T1 > -class VaryingSet2 : public VaryingPairBase { +class VaryingSet2 : public std::pair { public: - using Parent = VaryingPairBase; + using Parent = std::pair; typedef void is_proxy_tag; VaryingSet2() : Parent(Varying(T0()), Varying(T1())) {} @@ -116,13 +108,6 @@ public: Varying asVarying() const { return Varying((*this)); } }; -template Varying varyingGetSub(const VaryingSet2& dat, uint8_t index) { - return data[index]; -} -template uint8_t varyingGetLength(const VaryingSet2& data) { - return data.length(); -} - template class VaryingSet3 : public std::tuple{ public: @@ -155,13 +140,6 @@ public: Varying asVarying() const { return Varying((*this)); } }; -template Varying varyingGetSub(const VaryingSet3& dat, uint8_t index) { - return data[index]; -} -template uint8_t varyingGetLength(const VaryingSet3& data) { - return data.length(); -} - template class VaryingSet4 : public std::tuple{ public: @@ -198,12 +176,6 @@ public: Varying asVarying() const { return Varying((*this)); } }; -template Varying varyingGetSub(const VaryingSet4& dat, uint8_t index) { - return data[index]; -} -template uint8_t varyingGetLength(const VaryingSet4& data) { - return data.length(); -} template class VaryingSet5 : public std::tuple{ @@ -246,12 +218,6 @@ public: Varying asVarying() const { return Varying((*this)); } }; -template Varying varyingGetSub(const VaryingSet5& dat, uint8_t index) { - return data[index]; -} -template uint8_t varyingGetLength(const VaryingSet5& data) { - return data.length(); -} template class VaryingSet6 : public std::tuple{ @@ -300,12 +266,6 @@ public: Varying asVarying() const { return Varying((*this)); } }; -template Varying varyingGetSub(const VaryingSet6& dat, uint8_t index) { - return data[index]; -} -template uint8_t varyingGetLength(const VaryingSet6& data) { - return data.length(); -} template class VaryingSet7 : public std::tuple{ @@ -359,12 +319,6 @@ public: Varying asVarying() const { return Varying((*this)); } }; -template Varying varyingGetSub(const VaryingSet7& dat, uint8_t index) { - return data[index]; -} -template uint8_t varyingGetLength(const VaryingSet7& data) { - return data.length(); -} template class VaryingSet8 : public std::tuple { @@ -423,12 +377,6 @@ public: Varying asVarying() const { return Varying((*this)); } }; -template Varying varyingGetSub(const VaryingSet8& dat, uint8_t index) { - return data[index]; -} -template uint8_t varyingGetLength(const VaryingSet8& data) { - return data.length(); -} template class VaryingSet9 : public std::tuple { @@ -491,12 +439,6 @@ public: Varying asVarying() const { return Varying((*this)); } }; -template Varying varyingGetSub(const VaryingSet9& dat, uint8_t index) { - return data[index]; -} -template uint8_t varyingGetLength(const VaryingSet9& data) { - return data.length(); -} template < class T, int NUM > class VaryingArray : public std::array { @@ -512,12 +454,6 @@ public: std::copy(list.begin(), list.end(), std::array::begin()); } }; -template Varying varyingGetSub(const VaryingArray& dat, uint8_t index) { - return data[index]; -} -template uint8_t varyingGetLength(const VaryingArray& data) { - return NUM; -} }