Merge remote-tracking branch 'overte/master' into application

libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp

@@ -1748,9 +1748,8 @@ ShapePipelinePointer shapePipelineFactory(const ShapePlumber& plumber, const Sha
                 if (!std::get<2>(key)) {
                     _pipelines[std::make_tuple(std::get<0>(key), std::get<1>(key), std::get<2>(key), wireframe)] = std::make_shared<render::ShapePipeline>(pipeline, nullptr, nullptr, nullptr);
                 } else {
-                    const auto& fadeEffect = DependencyManager::get<FadeEffect>();
                     _pipelines[std::make_tuple(std::get<0>(key), std::get<1>(key), std::get<2>(key), wireframe)] = std::make_shared<render::ShapePipeline>(pipeline, nullptr,
-                        fadeEffect->getBatchSetter(), fadeEffect->getItemUniformSetter());
+                        FadeEffect::getBatchSetter(), FadeEffect::getItemUniformSetter());
                 }
             }
         }

libraries/entities-renderer/src/RenderableWebEntityItem.cpp

@@ -171,7 +171,7 @@ void WebEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene
         _dpi = entity->getDpi();
         _color = entity->getColor();
         _alpha = entity->getAlpha();
-        _wantsKeyboardFocus = entity->wantsKeyboardFocus();
+        _wantsKeyboardFocus = entity->getWantsKeyboardFocus();
         _pulseProperties = entity->getPulseProperties();
 
         if (_contentType == ContentType::NoContent) {

libraries/entities/src/EntityItem.h.in

@@ -397,7 +397,6 @@ public:
     QUuid getOwningAvatarIDForProperties() const;
 
     virtual bool wantsHandControllerPointerEvents() const { return false; }
-    virtual bool wantsKeyboardFocus() const { return false; }
     virtual void setProxyWindow(QWindow* proxyWindow) {}
     virtual QObject* getEventHandler() { return nullptr; }
 

libraries/render-utils/src/AmbientOcclusionEffect.cpp

@@ -842,6 +842,8 @@ void AmbientOcclusionEffect::run(const render::RenderContextPointer& renderConte
     config->setGPUBatchRunTime(_gpuTimer->getGPUAverage(), _gpuTimer->getBatchAverage());
 }
 
+gpu::PipelinePointer DebugAmbientOcclusion::_debugPipeline;
+
 void DebugAmbientOcclusion::configure(const Config& config) {
     _showCursorPixel = config.showCursorPixel;
 
@@ -851,7 +853,7 @@ void DebugAmbientOcclusion::configure(const Config& config) {
     }
 }
 
-const gpu::PipelinePointer& DebugAmbientOcclusion::getDebugPipeline() {
+gpu::PipelinePointer& DebugAmbientOcclusion::getDebugPipeline() {
     if (!_debugPipeline) {
         gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::ssao_debugOcclusion);
         gpu::StatePointer state = std::make_shared<gpu::State>();

libraries/render-utils/src/AmbientOcclusionEffect.h

@@ -283,9 +283,9 @@ class DebugAmbientOcclusion {
     };
     gpu::StructBuffer<Parameters> _parametersBuffer;
 
-    const gpu::PipelinePointer& getDebugPipeline();
+    static gpu::PipelinePointer& getDebugPipeline();
 
-    gpu::PipelinePointer _debugPipeline;
+    static gpu::PipelinePointer _debugPipeline;
 
     bool _showCursorPixel { false };
 };

libraries/render-utils/src/AntialiasingEffect.cpp

@@ -40,6 +40,9 @@ namespace gr {
 
 #if !ANTIALIASING_USE_TAA
 
+gpu::PipelinePointer Antialiasing::_antialiasingPipeline;
+gpu::PipelinePointer Antialiasing::_blendPipeline;
+
 Antialiasing::Antialiasing() {
     _geometryId = DependencyManager::get<GeometryCache>()->allocateID();
 }
@@ -144,6 +147,10 @@ void AntialiasingConfig::setAAMode(int mode) {
     emit dirty();
 }
 
+gpu::PipelinePointer Antialiasing::_antialiasingPipeline;
+gpu::PipelinePointer Antialiasing::_blendPipeline;
+gpu::PipelinePointer Antialiasing::_debugBlendPipeline;
+
 Antialiasing::Antialiasing(bool isSharpenEnabled) : 
     _isSharpenEnabled{ isSharpenEnabled } {
 }
@@ -154,7 +161,7 @@ Antialiasing::~Antialiasing() {
     _antialiasingTextures[1].reset();
 }
 
-const gpu::PipelinePointer& Antialiasing::getAntialiasingPipeline(const render::RenderContextPointer& renderContext) {
+gpu::PipelinePointer& Antialiasing::getAntialiasingPipeline() {
 
     if (!_antialiasingPipeline) {
         gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::taa);
@@ -169,7 +176,7 @@ const gpu::PipelinePointer& Antialiasing::getAntialiasingPipeline(const render::
     return _antialiasingPipeline;
 }
 
-const gpu::PipelinePointer& Antialiasing::getBlendPipeline() {
+gpu::PipelinePointer& Antialiasing::getBlendPipeline() {
     if (!_blendPipeline) {
         gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::fxaa_blend);
         gpu::StatePointer state = std::make_shared<gpu::State>();
@@ -180,7 +187,7 @@ const gpu::PipelinePointer& Antialiasing::getBlendPipeline() {
     return _blendPipeline;
 }
 
-const gpu::PipelinePointer& Antialiasing::getDebugBlendPipeline() {
+gpu::PipelinePointer& Antialiasing::getDebugBlendPipeline() {
     if (!_debugBlendPipeline) {
         gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::taa_blend);
         gpu::StatePointer state = std::make_shared<gpu::State>();
@@ -260,7 +267,6 @@ void Antialiasing::run(const render::RenderContextPointer& renderContext, const
         batch.setViewportTransform(args->_viewport);
 
         // TAA step
-        getAntialiasingPipeline(renderContext);
         batch.setResourceFramebufferSwapChainTexture(ru::Texture::TaaHistory, _antialiasingBuffers, 0);
         batch.setResourceTexture(ru::Texture::TaaSource, sourceBuffer->getRenderBuffer(0));
         batch.setResourceTexture(ru::Texture::TaaVelocity, velocityBuffer->getVelocityTexture());
@@ -269,9 +275,9 @@ void Antialiasing::run(const render::RenderContextPointer& renderContext, const
 
         batch.setUniformBuffer(ru::Buffer::TaaParams, _params);
         batch.setUniformBuffer(ru::Buffer::DeferredFrameTransform, deferredFrameTransform->getFrameTransformBuffer());
-        
+
         batch.setFramebufferSwapChain(_antialiasingBuffers, 1);
-        batch.setPipeline(getAntialiasingPipeline(renderContext));
+        batch.setPipeline(getAntialiasingPipeline());
         batch.draw(gpu::TRIANGLE_STRIP, 4);
 
         // Blend step

libraries/render-utils/src/AntialiasingEffect.h

@@ -213,18 +213,18 @@ class Antialiasing {
     void configure(const Config& config);
     void run(const render::RenderContextPointer& renderContext, const Inputs& inputs);
 
-    const gpu::PipelinePointer& getAntialiasingPipeline(const render::RenderContextPointer& renderContext);
-    const gpu::PipelinePointer& getBlendPipeline();
-    const gpu::PipelinePointer& getDebugBlendPipeline();
+    static gpu::PipelinePointer& getAntialiasingPipeline();
+    static gpu::PipelinePointer& getBlendPipeline();
+    static gpu::PipelinePointer& getDebugBlendPipeline();
 
 private:
 
     gpu::FramebufferSwapChainPointer _antialiasingBuffers;
     gpu::TexturePointer _antialiasingTextures[2];
     gpu::BufferPointer _blendParamsBuffer;
-    gpu::PipelinePointer _antialiasingPipeline;
-    gpu::PipelinePointer _blendPipeline;
-    gpu::PipelinePointer _debugBlendPipeline;
+    static gpu::PipelinePointer _antialiasingPipeline;
+    static gpu::PipelinePointer _blendPipeline;
+    static gpu::PipelinePointer _debugBlendPipeline;
 
     TAAParamsBuffer _params;
     AntialiasingConfig::Mode _mode{ AntialiasingConfig::TAA };
@@ -251,17 +251,17 @@ class Antialiasing {
     void configure(const Config& config) {}
     void run(const render::RenderContextPointer& renderContext, const gpu::FramebufferPointer& sourceBuffer);
 
-    const gpu::PipelinePointer& getAntialiasingPipeline();
-    const gpu::PipelinePointer& getBlendPipeline();
+    static gpu::PipelinePointer& getAntialiasingPipeline();
+    static gpu::PipelinePointer& getBlendPipeline();
 
 private:
     gpu::FramebufferPointer _antialiasingBuffer;
 
     gpu::TexturePointer _antialiasingTexture;
     gpu::BufferPointer _paramsBuffer;
 
-    gpu::PipelinePointer _antialiasingPipeline;
-    gpu::PipelinePointer _blendPipeline;
+    static gpu::PipelinePointer _antialiasingPipeline;
+    static gpu::PipelinePointer _blendPipeline;
     int _geometryId { 0 };
 };
 #endif

libraries/render-utils/src/BloomEffect.cpp

@@ -19,6 +19,11 @@
 
 #define BLOOM_BLUR_LEVEL_COUNT  3
 
+gpu::PipelinePointer BloomThreshold::_pipeline;
+gpu::PipelinePointer BloomApply::_pipeline;
+gpu::PipelinePointer BloomDraw::_pipeline;
+gpu::PipelinePointer DebugBloom::_pipeline;
+
 BloomThreshold::BloomThreshold(unsigned int downsamplingFactor) {
     assert(downsamplingFactor > 0);
     _parameters.edit()._sampleCount = downsamplingFactor;

libraries/render-utils/src/BloomEffect.h

@@ -43,8 +43,8 @@ class BloomThreshold {
 
 #include "BloomThreshold.shared.slh"
 
+    static gpu::PipelinePointer _pipeline;
     gpu::FramebufferPointer _outputBuffer;
-    gpu::PipelinePointer _pipeline;
     gpu::StructBuffer<Parameters> _parameters;
 };
 
@@ -68,7 +68,7 @@ class BloomApply {
 
 #include "BloomApply.shared.slh"
 
-    gpu::PipelinePointer _pipeline;
+    static gpu::PipelinePointer _pipeline;
     gpu::StructBuffer<Parameters> _parameters;
 };
 
@@ -83,7 +83,7 @@ class BloomDraw {
 
 private:
 
-    gpu::PipelinePointer _pipeline;
+    static gpu::PipelinePointer _pipeline;
 };
 
 class DebugBloomConfig : public render::Job::Config {
@@ -125,7 +125,7 @@ class DebugBloom {
     void run(const render::RenderContextPointer& renderContext, const Inputs& inputs);
 
 private:
-    gpu::PipelinePointer _pipeline;
+    static gpu::PipelinePointer _pipeline;
     gpu::BufferPointer _params;
     DebugBloomConfig::Mode _mode;
 };

libraries/render-utils/src/DebugDeferredBuffer.cpp

@@ -250,6 +250,9 @@ static std::string getFileContent(const std::string& fileName, const std::string
     return defaultContent;
 }
 
+DebugDeferredBuffer::StandardPipelines DebugDeferredBuffer::_pipelines;
+DebugDeferredBuffer::CustomPipelines DebugDeferredBuffer::_customPipelines;
+
 #include <QStandardPaths>  // TODO REMOVE: Temporary until UI
 DebugDeferredBuffer::DebugDeferredBuffer() {
     // TODO REMOVE: Temporary until UI
@@ -334,7 +337,7 @@ std::string DebugDeferredBuffer::getShaderSourceCode(Mode mode, const std::strin
     return std::string();
 }
 
-bool DebugDeferredBuffer::pipelineNeedsUpdate(Mode mode, const std::string& customFile) const {
+bool DebugDeferredBuffer::pipelineNeedsUpdate(Mode mode, const std::string& customFile) {
     if (mode != CustomMode) {
         return !_pipelines[mode];
     }
@@ -351,7 +354,7 @@ bool DebugDeferredBuffer::pipelineNeedsUpdate(Mode mode, const std::string& cust
     return true;
 }
 
-const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, const std::string& customFile) {
+gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, const std::string& customFile) {
     if (pipelineNeedsUpdate(mode, customFile)) {
         static_assert(shader::render_utils::program::debug_deferred_buffer != 0, "Validate debug deferred program");
 

libraries/render-utils/src/DebugDeferredBuffer.h

@@ -107,18 +107,18 @@ class DebugDeferredBuffer {
 
     struct CustomPipeline {
         gpu::PipelinePointer pipeline;
-        mutable QFileInfo info;
+        QFileInfo info;
     };
     using StandardPipelines = std::array<gpu::PipelinePointer, NumModes>;
     using CustomPipelines = std::unordered_map<std::string, CustomPipeline>;
 
-    bool pipelineNeedsUpdate(Mode mode, const std::string& customFile = std::string()) const;
-    const gpu::PipelinePointer& getPipeline(Mode mode, const std::string& customFile = std::string());
-    std::string getShaderSourceCode(Mode mode, const std::string& customFile = std::string());
+    static bool pipelineNeedsUpdate(Mode mode, const std::string& customFile = std::string());
+    static gpu::PipelinePointer& getPipeline(Mode mode, const std::string& customFile = std::string());
+    static std::string getShaderSourceCode(Mode mode, const std::string& customFile = std::string());
 
     ParametersBuffer _parameters;
-    StandardPipelines _pipelines;
-    CustomPipelines _customPipelines;
+    static StandardPipelines _pipelines;
+    static CustomPipelines _customPipelines;
     int _geometryId{ 0 };
 };
 

libraries/render-utils/src/FadeEffect.cpp

@@ -17,33 +17,36 @@
 #include "render-utils/ShaderConstants.h"
 #include <PathUtils.h>
 
+gpu::TexturePointer FadeEffect::_maskMap;
+
 FadeEffect::FadeEffect() {
-    auto texturePath = PathUtils::resourcesPath() + "images/fadeMask.png";
-    _maskMap = DependencyManager::get<TextureCache>()->getImageTexture(texturePath, image::TextureUsage::STRICT_TEXTURE);
+    std::once_flag once;
+    std::call_once(once, [] {
+        auto texturePath = PathUtils::resourcesPath() + "images/fadeMask.png";
+        _maskMap = DependencyManager::get<TextureCache>()->getImageTexture(texturePath, image::TextureUsage::STRICT_TEXTURE);
+    });
 }
 
-void FadeEffect::build(render::Task::TaskConcept& task, const task::Varying& editableItems) {
+void FadeEffect::build(JobModel& task, const render::Varying& inputs, render::Varying& outputs) {
     auto editedFadeCategory = task.addJob<FadeJob>("Fade");
-    auto& fadeJob = task._jobs.back();
-    _configurations = fadeJob.get<FadeJob>().getConfigurationBuffer();
 
-    const auto fadeEditInput = FadeEditJob::Input(editableItems, editedFadeCategory).asVarying();
+    const auto fadeEditInput = FadeEditJob::Input(inputs, editedFadeCategory).asVarying();
     task.addJob<FadeEditJob>("FadeEdit", fadeEditInput);
 }
 
-render::ShapePipeline::BatchSetter FadeEffect::getBatchSetter() const {
-    return [this](const render::ShapePipeline& shapePipeline, gpu::Batch& batch, render::Args*) {
+render::ShapePipeline::BatchSetter FadeEffect::getBatchSetter() {
+    return [](const render::ShapePipeline& shapePipeline, gpu::Batch& batch, render::Args*) {
         batch.setResourceTexture(render_utils::slot::texture::FadeMask, _maskMap);
-        batch.setUniformBuffer(render_utils::slot::buffer::FadeParameters, _configurations);
+        batch.setUniformBuffer(render_utils::slot::buffer::FadeParameters, FadeJob::getConfigurationBuffer());
     };
 }
 
-render::ShapePipeline::ItemSetter FadeEffect::getItemUniformSetter() const {
+render::ShapePipeline::ItemSetter FadeEffect::getItemUniformSetter() {
     return [](const render::ShapePipeline& shapePipeline, render::Args* args, const render::Item& item) {
         if (!render::TransitionStage::isIndexInvalid(item.getTransitionId())) {
             const auto& scene = args->_scene;
             const auto& batch = args->_batch;
-            auto transitionStage = scene->getStage<render::TransitionStage>(render::TransitionStage::getName());
+            auto transitionStage = scene->getStage<render::TransitionStage>();
             auto& transitionState = transitionStage->getTransition(item.getTransitionId());
 
             if (transitionState.paramsBuffer._size != sizeof(gpu::StructBuffer<FadeObjectParams>)) {
@@ -71,39 +74,3 @@ render::ShapePipeline::ItemSetter FadeEffect::getItemUniformSetter() const {
         }
     };
 }
-
-render::ShapePipeline::ItemSetter FadeEffect::getItemStoredSetter() {
-    return [this](const render::ShapePipeline& shapePipeline, render::Args* args, const render::Item& item) {
-        if (!render::TransitionStage::isIndexInvalid(item.getTransitionId())) {
-            auto scene = args->_scene;
-            auto transitionStage = scene->getStage<render::TransitionStage>(render::TransitionStage::getName());
-            auto& transitionState = transitionStage->getTransition(item.getTransitionId());
-            const auto fadeCategory = FadeJob::transitionToCategory[transitionState.eventType];
-
-            _lastCategory = fadeCategory;
-            _lastThreshold = transitionState.threshold;
-            _lastNoiseOffset = transitionState.noiseOffset;
-            _lastBaseOffset = transitionState.baseOffset;
-            _lastBaseInvSize = transitionState.baseInvSize;
-        }
-    };
-}
-
-void FadeEffect::packToAttributes(const int category, const float threshold, const glm::vec3& noiseOffset,
-    const glm::vec3& baseOffset, const glm::vec3& baseInvSize,
-    glm::vec4& packedData1, glm::vec4& packedData2, glm::vec4& packedData3) {
-    packedData1.x = noiseOffset.x;
-    packedData1.y = noiseOffset.y;
-    packedData1.z = noiseOffset.z;
-    packedData1.w = (float)(category+0.1f); // GLSL hack so that casting back from float to int in fragment shader returns the correct value.
-
-    packedData2.x = baseOffset.x;
-    packedData2.y = baseOffset.y;
-    packedData2.z = baseOffset.z;
-    packedData2.w = threshold;
-
-    packedData3.x = baseInvSize.x;
-    packedData3.y = baseInvSize.y;
-    packedData3.z = baseInvSize.z;
-    packedData3.w = 0.f;
-}