X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.cpp;h=06675f346c85211030d0712097aa0db138b1fef6;hb=06bf43108bde2d00776281fa916f42cdecd22ef1;hp=4a6eafe10bfd3f77cee02743694d68bbb0848657;hpb=12677633d653f654e3d75c232206585aebb06362;p=nageru

diff --git a/glwidget.cpp b/glwidget.cpp
index 4a6eafe..06675f3 100644
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -1,16 +1,38 @@
-#include "context.h"
+#include <qmetatype.h>  // Needs to come before egl.h.
+#include <qdatastream.h>  // Needs to come before egl.h.
+#include <qtextstream.h>  // Needs to come before egl.h.
+#include <qcursor.h>  // Needs to come before egl.h.
+#include <qcoreevent.h>  // Needs to come before egl.h.
+#include <qevent.h>  // Needs to come before egl.h.
+#include <epoxy/gl.h>
+#include <epoxy/egl.h>
+#include <QSurfaceFormat>
+
 #include "glwidget.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 <QCoreApplication>
-#include <QGuiApplication>
-#include <QThread>
-#include <math.h>
-#include <EGL/egl.h>
-#include <GL/glx.h>
-#include <thread>
+#include "qnamespace.h"
+#include "ref_counted_gl_sync.h"
+
+class QMouseEvent;
+class QWidget;
+
+#undef Success
+#include <movit/util.h>
+#include <string>
+
+using namespace std;
 
 GLWidget::GLWidget(QWidget *parent)
-    : QOpenGLWidget(parent)
+    : QGLWidget(parent, global_share_widget)
 {
 }
 
@@ -18,30 +40,51 @@ GLWidget::~GLWidget()
 {
 }
 
-QSize GLWidget::minimumSizeHint() const
+void GLWidget::initializeGL()
 {
-	return QSize(50, 50);
+	static std::once_flag flag;
+	std::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);
+	glDisable(GL_DEPTH_TEST);
+	glDepthMask(GL_FALSE);
 }
 
-QSize GLWidget::sizeHint() const
+void GLWidget::resizeGL(int width, int height)
 {
-	return QSize(400, 400);
+	glViewport(0, 0, width, height);
 }
 
-void GLWidget::initializeGL()
+void GLWidget::paintGL()
 {
-	printf("egl=%p glx=%p\n", eglGetCurrentContext(), glXGetCurrentContext());
-	//printf("threads: %p %p\n", QThread::currentThread(), qGuiApp->thread());
-
-	QSurface *surface = create_surface(format());
-	QSurface *surface2 = create_surface(format());
-	QSurface *surface3 = create_surface(format());
-	QSurface *surface4 = create_surface(format());
-	start_mixer(surface, surface2, surface3, surface4);
+	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();
 }
 
-void GLWidget::paintGL()
+void GLWidget::mousePressEvent(QMouseEvent *event)
 {
-	glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	emit clicked();
 }