X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.cpp;h=3d5b0f97abe86a494bedda4ee5607e14499a2be2;hb=2c8eee23b6b475fb687d6edcc8113baf78e12905;hp=3cd63585633d8bb314376d6600f1de435f82d6b3;hpb=35624172bcc406eca72ac3d2de5754c214df8080;p=nageru

diff --git a/glwidget.cpp b/glwidget.cpp
index 3cd6358..3d5b0f9 100644
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -7,21 +7,23 @@
 #include <epoxy/gl.h>
 #include <epoxy/egl.h>
 #include <QSurfaceFormat>
+#include <movit/resource_pool.h>
 
 #include "glwidget.h"
-#include "mainwindow.h"
 
-#include <movit/resource_pool.h>
 #include <stdio.h>
+#include <functional>
 #include <mutex>
 
 #include "context.h"
+#include "effect_chain.h"
+#include "flags.h"
+#include "mainwindow.h"
 #include "mixer.h"
+#include "qnamespace.h"
 #include "ref_counted_gl_sync.h"
-#include "vumeter.h"
 
-class MainWindow;
-class QSurface;
+class QMouseEvent;
 class QWidget;
 
 #undef Success
@@ -31,29 +33,30 @@ class QWidget;
 using namespace std;
 
 GLWidget::GLWidget(QWidget *parent)
-    : QGLWidget(parent, global_share_widget),
-      resource_pool(new movit::ResourcePool)
+    : QGLWidget(parent, global_share_widget)
 {
 }
 
-GLWidget::~GLWidget()
+void GLWidget::clean_context()
 {
+	if (resource_pool != nullptr) {
+		makeCurrent();
+		resource_pool->clean_context();
+	}
 }
 
 void GLWidget::initializeGL()
 {
-	printf("egl context=%p\n", eglGetCurrentContext());
-	//printf("threads: %p %p\n", QThread::currentThread(), qGuiApp->thread());
-
-	static std::once_flag flag;
-	std::call_once(flag, [this]{
-		global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()));
+	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();
 	});
 	global_mixer->set_frame_ready_callback(output, [this]{
 		QMetaObject::invokeMethod(this, "update", Qt::AutoConnection);
 		emit transition_names_updated(global_mixer->get_transition_names());
+		emit resolution_updated(output);
 	});
 
 	glDisable(GL_BLEND);
@@ -71,14 +74,25 @@ void GLWidget::paintGL()
 	Mixer::DisplayFrame frame;
 	if (!global_mixer->get_display_frame(output, &frame)) {
 		glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
+		check_error();
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+		check_error();
 		return;
 	}
 
+	check_error();
 	glWaitSync(frame.ready_fence.get(), /*flags=*/0, GL_TIMEOUT_IGNORED);
+	check_error();
 	frame.setup_chain();
+	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)