Fiddle a bit to get epoxy and Qt to work better together.

diff --git a/glwidget.cpp b/glwidget.cpp
index d436308974aa380f8cfa7834c5826e53f3d13f4a..b9021446abae3f79adf1ca0659a892a39e64662a 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -1,3 +1,10 @@
+#include <qmetatype.h>
+#include <qdatastream.h>
+#include <qtextstream.h>
+#include <qcursor.h>
+#include <qcoreevent.h>
+#include <epoxy/gl.h>
+#include <epoxy/egl.h>
 #include "context.h"
 #include "glwidget.h"
 #include "mixer.h"
@@ -5,8 +12,6 @@
 #include <QGuiApplication>
 #include <QThread>
 #include <math.h>
-#include <EGL/egl.h>
-#include <GL/glx.h>
 #include <thread>
 
 GLWidget::GLWidget(QWidget *parent)
@@ -20,7 +25,7 @@ GLWidget::~GLWidget()
 
 void GLWidget::initializeGL()
 {
-       printf("egl=%p glx=%p\n", eglGetCurrentContext(), glXGetCurrentContext());
+       printf("egl context=%p\n", eglGetCurrentContext());
        //printf("threads: %p %p\n", QThread::currentThread(), qGuiApp->thread());
 
        QSurface *surface = create_surface(format());

diff --git a/glwidget.h b/glwidget.h
index 65bf3a90e2611011ba4791fbe743d3facc58246c..7e37c4ce2ec9b24487a15f39b3a819e2afa20bc0 100644 (file)
--- a/glwidget.h
+++ b/glwidget.h
@@ -2,10 +2,6 @@
 #define GLWIDGET_H
 
 #include <QOpenGLWidget>
-#include <QOpenGLFunctions>
-#include <QOpenGLVertexArrayObject>
-#include <QOpenGLBuffer>
-#include <QMatrix4x4>
 
 class GLWidget : public QOpenGLWidget
 {