Remove some commented-out code.

[nageru] / glwidget.cpp

diff --git a/glwidget.cpp b/glwidget.cpp
index 06675f346c85211030d0712097aa0db138b1fef6..3d5b0f97abe86a494bedda4ee5607e14499a2be2 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -7,6 +7,7 @@
 #include <epoxy/gl.h>
 #include <epoxy/egl.h>
 #include <QSurfaceFormat>
+#include <movit/resource_pool.h>
 
 #include "glwidget.h"
 
@@ -36,14 +37,18 @@ GLWidget::GLWidget(QWidget *parent)
 {
 }
 
-GLWidget::~GLWidget()
+void GLWidget::clean_context()
 {
+       if (resource_pool != nullptr) {
+               makeCurrent();
+               resource_pool->clean_context();
+       }
 }
 
 void GLWidget::initializeGL()
 {
-       static std::once_flag flag;
-       std::call_once(flag, [this]{
+       static once_flag flag;
+       call_once(flag, [this]{
                global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()), global_flags.num_cards);
                global_mainwindow->mixer_created(global_mixer);
                global_mixer->start();
@@ -82,6 +87,12 @@ void GLWidget::paintGL()
        check_error();
        frame.chain->render_to_screen();
        check_error();
+
+       if (resource_pool == nullptr) {
+               resource_pool = frame.chain->get_resource_pool();
+       } else {
+               assert(resource_pool == frame.chain->get_resource_pool());
+       }
 }
 
 void GLWidget::mousePressEvent(QMouseEvent *event)