X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=context.cpp;h=eb62183a3b3a8c9c7c9065f6d212a21b92e8257e;hb=c094b73565559282001764edfbf0f4926d3197fb;hp=946d40dc84ab1b0c5462311f6e4bdf1af3355f10;hpb=95295bd41bc711bbc450ac6f5ccc68e64fefffa3;p=nageru

diff --git a/context.cpp b/context.cpp
index 946d40d..eb62183 100644
--- a/context.cpp
+++ b/context.cpp
@@ -1,30 +1,40 @@
 #include <stdio.h>
-#include <stdlib.h>
 
-#include <QOpenGLContext>
+#include <string>
+
+#include <QGL>
 #include <QOffscreenSurface>
-#include <QWindow>
-#include <QGLWidget>
+#include <QOpenGLContext>
+#include <QSurface>
+#include <QSurfaceFormat>
 
 QGLWidget *global_share_widget = nullptr;
+bool using_egl = false;
+
+using namespace std;
 
 QSurface *create_surface(const QSurfaceFormat &format)
 {
 	QOffscreenSurface *surface = new QOffscreenSurface;
 	surface->setFormat(format);
-//	QWindow *surface = new QWindow;
 	surface->create();
 	if (!surface->isValid()) {
-		printf("ERROR: surface not valid!\n");
-//		abort();
+		fprintf(stderr, "ERROR: surface not valid!\n");
+		exit(1);
 	}
 	return surface;
 }
 
-QOpenGLContext *create_context()
+QSurface *create_surface_with_same_format(const QSurface *surface)
+{
+	return create_surface(surface->format());
+}
+
+QOpenGLContext *create_context(const QSurface *surface)
 {
 	QOpenGLContext *context = new QOpenGLContext;
 	context->setShareContext(global_share_widget->context()->contextHandle());
+	context->setFormat(surface->format());
 	context->create();
 	return context;
 }
@@ -33,3 +43,8 @@ bool make_current(QOpenGLContext *context, QSurface *surface)
 {
 	return context->makeCurrent(surface);
 }
+
+void delete_context(QOpenGLContext *context)
+{
+	delete context;
+}