Merge pull request #15803 from SamGondelman/setPipeline

BUGZ-703: Possible fix for do_setPipeline crash and other Mac fixes

libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp

@@ -593,9 +593,10 @@ std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> OpenGL
         hudEyeViewports[eye] = eyeViewport(eye);
     });
     return [=](gpu::Batch& batch, const gpu::TexturePointer& hudTexture, bool mirror) {
-        if (hudPipeline && hudTexture) {
+        auto pipeline = mirror ? hudMirrorPipeline : hudPipeline;
+        if (pipeline && hudTexture) {
             batch.enableStereo(false);
-            batch.setPipeline(mirror ? hudMirrorPipeline : hudPipeline);
+            batch.setPipeline(pipeline);
             batch.setResourceTexture(0, hudTexture);
             if (hudStereo) {
                 for_each_eye([&](Eye eye) {
@@ -661,17 +662,6 @@ void OpenGLDisplayPlugin::compositeLayers() {
         compositeScene();
     }
 
-#ifdef HIFI_ENABLE_NSIGHT_DEBUG
-    if (false) // do not draw the HUD if running nsight debug
-#endif
-    {
-        PROFILE_RANGE_EX(render_detail, "handleHUDBatch", 0xff0077ff, (uint64_t)presentCount())
-        auto hudOperator = getHUDOperator();
-        withPresentThreadLock([&] {
-            _hudOperator = hudOperator;
-        });
-    }
-
     {
         PROFILE_RANGE_EX(render_detail, "compositeExtra", 0xff0077ff, (uint64_t)presentCount())
         compositeExtra();

libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h

@@ -86,6 +86,8 @@ public:
 
     void copyTextureToQuickFramebuffer(NetworkTexturePointer source, QOpenGLFramebufferObject* target, GLsync* fenceSync) override;
 
+    virtual std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> getHUDOperator() override;
+
 protected:
     friend class PresentThread;
 
@@ -102,7 +104,6 @@ protected:
     virtual QThread::Priority getPresentPriority() { return QThread::HighPriority; }
     virtual void compositeLayers();
     virtual void compositeScene();
-    virtual std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> getHUDOperator();
     virtual void compositePointer();
     virtual void compositeExtra() {};
 

libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp

@@ -1,4 +1,4 @@
-//
+//
 //  Created by Bradley Austin Davis on 2016/02/15
 //  Copyright 2016 High Fidelity, Inc.
 //
@@ -402,25 +402,18 @@ void HmdDisplayPlugin::HUDRenderer::build() {
     format->setAttribute(gpu::Stream::POSITION, gpu::Stream::POSITION, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
     format->setAttribute(gpu::Stream::TEXCOORD, gpu::Stream::TEXCOORD, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::UV));
     uniformsBuffer = std::make_shared<gpu::Buffer>(sizeof(Uniforms), nullptr);
-    updatePipeline();
+
+    auto program = gpu::Shader::createProgram(shader::render_utils::program::hmd_ui);
+    gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+    state->setDepthTest(gpu::State::DepthTest(true, true, gpu::LESS_EQUAL));
+    state->setBlendFunction(true,
+                            gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
+                            gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
+
+    pipeline = gpu::Pipeline::create(program, state);
 }
 
-void HmdDisplayPlugin::HUDRenderer::updatePipeline() {
+std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> HmdDisplayPlugin::HUDRenderer::render() {
-    if (!pipeline) {
-        auto program = gpu::Shader::createProgram(shader::render_utils::program::hmd_ui);
-        gpu::StatePointer state = gpu::StatePointer(new gpu::State());
-        state->setDepthTest(gpu::State::DepthTest(true, true, gpu::LESS_EQUAL));
-        state->setBlendFunction(true,
-            gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
-            gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
-
-        pipeline = gpu::Pipeline::create(program, state);
-    }
-}
-
-std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> HmdDisplayPlugin::HUDRenderer::render(HmdDisplayPlugin& plugin) {
-    updatePipeline();
-
     auto hudPipeline = pipeline;
     auto hudFormat = format;
     auto hudVertices = vertices;
@@ -479,7 +472,7 @@ void HmdDisplayPlugin::compositePointer() {
 }
 
 std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> HmdDisplayPlugin::getHUDOperator() {
-    return _hudRenderer.render(*this);
+    return _hudRenderer.render();
 }
 
 HmdDisplayPlugin::~HmdDisplayPlugin() {

libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h

@@ -48,6 +48,7 @@ public:
 
     void pluginUpdate() override {};
 
+    std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> getHUDOperator() override;
     virtual StencilMaskMode getStencilMaskMode() const override { return StencilMaskMode::PAINT; }
 
 signals:
@@ -62,7 +63,6 @@ protected:
 
     bool internalActivate() override;
     void internalDeactivate() override;
-    std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> getHUDOperator() override;
     void compositePointer() override;
     void internalPresent() override;
     void customizeContext() override;
@@ -105,7 +105,7 @@ private:
         gpu::BufferPointer vertices;
         gpu::BufferPointer indices;
         uint32_t indexCount { 0 };
-        gpu::PipelinePointer pipeline;
+        gpu::PipelinePointer pipeline { nullptr };
 
         gpu::BufferPointer uniformsBuffer;
 
@@ -123,7 +123,6 @@ private:
         static const int VERTEX_STRIDE { sizeof(Vertex) };
 
         void build();
-        void updatePipeline();
+        std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> render();
-        std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> render(HmdDisplayPlugin& plugin);
     } _hudRenderer;
 };

libraries/physics/src/PhysicalEntitySimulation.cpp

@@ -309,20 +309,28 @@ void PhysicalEntitySimulation::buildMotionStatesForEntitiesThatNeedThem() {
     SetOfEntities::iterator entityItr = _entitiesToAddToPhysics.begin();
     while (entityItr != _entitiesToAddToPhysics.end()) {
         EntityItemPointer entity = (*entityItr);
-        assert(!entity->getPhysicsInfo());
         if (entity->isDead()) {
             prepareEntityForDelete(entity);
             entityItr = _entitiesToAddToPhysics.erase(entityItr);
-        } else if (!entity->shouldBePhysical()) {
+            continue;
-            // this entity should no longer be on _entitiesToAddToPhysics
+        }
+        if (entity->getPhysicsInfo()) {
             entityItr = _entitiesToAddToPhysics.erase(entityItr);
+            continue;
+        }
+        if (!entity->shouldBePhysical()) {
+            // this entity should no longer be on _entitiesToAddToPhysics
             if (entity->isMovingRelativeToParent()) {
                 SetOfEntities::iterator itr = _simpleKinematicEntities.find(entity);
                 if (itr == _simpleKinematicEntities.end()) {
                     _simpleKinematicEntities.insert(entity);
                 }
             }
-        } else if (entity->isReadyToComputeShape()) {
+            entityItr = _entitiesToAddToPhysics.erase(entityItr);
+            continue;
+        }
+
+        if (entity->isReadyToComputeShape()) {
             ShapeRequest shapeRequest(entity);
             ShapeRequests::iterator  requestItr = _shapeRequests.find(shapeRequest);
             if (requestItr == _shapeRequests.end()) {
@@ -332,18 +340,7 @@ void PhysicalEntitySimulation::buildMotionStatesForEntitiesThatNeedThem() {
                 uint32_t requestCount = ObjectMotionState::getShapeManager()->getWorkRequestCount();
                 btCollisionShape* shape = const_cast<btCollisionShape*>(ObjectMotionState::getShapeManager()->getShape(shapeInfo));
                 if (shape) {
-                    EntityMotionState* motionState = static_cast<EntityMotionState*>(entity->getPhysicsInfo());
+                    buildMotionState(shape, entity);
-                    if (!motionState) {
-                        buildMotionState(shape, entity);
-                    } else {
-                        // Is it possible to fall in here?
-                        // entity shouldn't be on _entitiesToAddToPhysics list if it already has a motionState.
-                        // but just in case...
-                        motionState->setShape(shape);
-                        motionState->setRegion(_space->getRegion(entity->getSpaceIndex()));
-                        _physicalObjects.insert(motionState);
-                        _incomingChanges.insert(motionState);
-                    }
                 } else if (requestCount != ObjectMotionState::getShapeManager()->getWorkRequestCount()) {
                     // shape doesn't exist but a new worker has been spawned to build it --> add to shapeRequests and wait
                     shapeRequest.shapeHash = shapeInfo.getHash();
@@ -354,6 +351,7 @@ void PhysicalEntitySimulation::buildMotionStatesForEntitiesThatNeedThem() {
             }
             entityItr = _entitiesToAddToPhysics.erase(entityItr);
         } else {
+            // skip for later
             ++entityItr;
         }
     }

libraries/physics/src/ThreadSafeDynamicsWorld.cpp

@@ -181,7 +181,7 @@ void ThreadSafeDynamicsWorld::drawConnectedSpheres(btIDebugDraw* drawer, btScala
     btVector3 xAxis = direction.cross(btVector3(0.0f, 1.0f, 0.0f));
     xAxis = xAxis.length() < EPSILON ? btVector3(1.0f, 0.0f, 0.0f) : xAxis.normalize();
     btVector3 zAxis = xAxis.cross(btVector3(0.0f, 1.0f, 0.0f));
-    zAxis = (direction.normalize().getY() < EPSILON) ? btVector3(0.0f, 1.0f, 0.0f) : zAxis.normalize();
+    zAxis = (direction.length2() < EPSILON || direction.normalize().getY() < EPSILON) ? btVector3(0.0f, 1.0f, 0.0f) : zAxis.normalize();
     float fullCircle = 2.0f * PI;
     for (float i = 0; i < fullCircle; i += stepRadians) {
         float x1 = btSin(btScalar(i)) * radius1;

libraries/plugins/src/plugins/DisplayPlugin.cpp

@@ -35,15 +35,6 @@ void DisplayPlugin::waitForPresent() {
     }
 }
 
-std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> DisplayPlugin::getHUDOperator() {
-    std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> hudOperator;
-    {
-        QMutexLocker locker(&_presentMutex);
-        hudOperator = _hudOperator;
-    }
-    return hudOperator;
-}
-
 glm::mat4 HmdDisplay::getEyeToHeadTransform(Eye eye) const {
     static const glm::mat4 xform;
     return xform;

libraries/plugins/src/plugins/DisplayPlugin.h

@@ -213,13 +213,12 @@ public:
     void waitForPresent();
     float getAveragePresentTime() { return _movingAveragePresent.average / (float)USECS_PER_MSEC; }  // in msec
 
-    std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> getHUDOperator();
-
     static const QString& MENU_PATH();
 
     // for updating plugin-related commands. Mimics the input plugin.
     virtual void pluginUpdate() = 0;
 
+    virtual std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> getHUDOperator() { return nullptr; }
     virtual StencilMaskMode getStencilMaskMode() const { return StencilMaskMode::NONE; }
     using StencilMaskMeshOperator = std::function<void(gpu::Batch&)>;
     virtual StencilMaskMeshOperator getStencilMaskMeshOperator() { return nullptr; }
@@ -234,8 +233,6 @@ protected:
 
     gpu::ContextPointer _gpuContext;
 
-    std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> _hudOperator { std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)>() };
-
     MovingAverage<float, 10> _movingAveragePresent;
 
     float _renderResolutionScale { 1.0f };

libraries/render-utils/src/RenderCommonTask.cpp

@@ -111,7 +111,7 @@ void CompositeHUD::run(const RenderContextPointer& renderContext, const gpu::Fra
     assert(renderContext->args->_context);
 
     // We do not want to render HUD elements in secondary camera
-    if (renderContext->args->_renderMode == RenderArgs::RenderMode::SECONDARY_CAMERA_RENDER_MODE) {
+    if (nsightActive() || renderContext->args->_renderMode == RenderArgs::RenderMode::SECONDARY_CAMERA_RENDER_MODE) {
         return;
     }
 

libraries/render/src/render/Args.h

@@ -124,20 +124,20 @@ namespace render {
         DebugFlags _debugFlags { RENDER_DEBUG_NONE };
         gpu::Batch* _batch = nullptr;
 
-        uint32_t _globalShapeKey{ 0 };
+        uint32_t _globalShapeKey { 0 };
-        uint32_t _itemShapeKey{ 0 };
+        uint32_t _itemShapeKey { 0 };
-        bool _enableTexturing{ true };
+        bool _enableTexturing { true };
-        bool _enableBlendshape{ true };
+        bool _enableBlendshape { true };
-        bool _enableSkinning{ true };
+        bool _enableSkinning { true };
 
-        bool _enableFade{ false };
+        bool _enableFade { false };
 
         RenderDetails _details;
         render::ScenePointer _scene;
         int8_t _cameraMode { -1 };
 
-        std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> _hudOperator;
+        std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> _hudOperator { nullptr };
-        gpu::TexturePointer _hudTexture;
+        gpu::TexturePointer _hudTexture { nullptr };
 
         bool _takingSnapshot { false };
         StencilMaskMode _stencilMaskMode { StencilMaskMode::NONE };