rollback experiments

src/common/subsystems.hpp

@@ -262,11 +262,11 @@ static void error_callback(int error, const char *description) {
 class Window {
     cv::Size size_;
     bool offscreen_;
+    string title_;
     int major_;
     int minor_;
     int samples_;
     bool debug_;
-    string title_;
     GLFWwindow *glfwWindow_ = nullptr;
     CLGLContext* clglContext_ = nullptr;
     CLVAContext* clvaContext_ = nullptr;
@@ -276,8 +276,6 @@ class Window {
     nanogui::Screen* screen_ = nullptr;
     nanogui::FormHelper* form_ = nullptr;
     cv::TickMeter tickMeter_;
-    std::mutex pollMutex_;
-    bool startPolling_ = false;
     bool closed_ = false;
 public:
 
@@ -579,9 +577,9 @@ public:
     }
 
     bool display() {
-        std::scoped_lock<std::mutex> lock(pollMutex_);
         bool result = true;
         if (!offscreen_) {
+            glfwPollEvents();
             screen_->draw_contents();
             clglContext_->blitFrameBufferToScreen();
             screen_->draw_widgets();
@@ -589,16 +587,9 @@ public:
             result = !glfwWindowShouldClose(glfwWindow_);
         }
 
-        startPolling_ = true;
         return result;
     }
 
-    void pollEvents() {
-        std::scoped_lock<std::mutex> lock(pollMutex_);
-        if(startPolling_)
-            glfwPollEvents();
-    }
-
     bool isClosed() {
         return closed_;
 

src/optflow/optflow-demo.cpp

@@ -184,10 +184,9 @@ void composite_layers(const cv::UMat background, const cv::UMat foreground, cons
 }
 
 void setup_gui(cv::Ptr<kb::Window> window) {
-    window->makeWindow(6, 45, "Settings");
+    window->makeWindow(5, 45, "Settings");
-
-    auto useOpenCL = window->makeFormVariable("Use OpenCL", use_opencl, "Enable or disable OpenCL acceleration");
 
+    window->makeFormVariable("Use OpenCL", use_opencl, "Enable or disable OpenCL acceleration");
     window->makeGroup("Foreground");
     window->makeFormVariable("Scale", fg_scale, 0.1f, 4.0f, true, "", "Generate the foreground at this scale");
     window->makeFormVariable("Loss", fg_loss, 0.1f, 99.9f, true, "%", "On every frame the foreground loses on brightness");
@@ -233,9 +232,8 @@ int main(int argc, char **argv) {
         exit(1);
     }
     cv::Ptr<kb::Window> window = new kb::Window(cv::Size(WIDTH, HEIGHT), OFFSCREEN, "Sparse Optical Flow Demo");
-
-    std::thread worker([&]() {
     window->initialize();
+
     kb::print_system_info();
     setup_gui(window);
 
@@ -302,15 +300,6 @@ int main(int argc, char **argv) {
         if(!window->display())
             break;
     }
-        window->close();
-    });
-
-    while(!window->isClosed()) {
-        window->pollEvents();
-        std::this_thread::sleep_for(10ms);
-    }
-
-    worker.join();
 
     return 0;
 }