Use the new texture bounce override instead of relying on a patched Movit.

[nageru] / glwidget.cpp

diff --git a/glwidget.cpp b/glwidget.cpp
index 3482a13391609c049869650d7aadb32481cb94ec..daadaf2f8d0e222efca7403e60226e20e86bfa46 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -3,6 +3,7 @@
 #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>
@@ -17,6 +18,7 @@
 #include "context.h"
 #include "mixer.h"
 #include "ref_counted_gl_sync.h"
+#include "vumeter.h"
 
 class MainWindow;
 class QSurface;
@@ -46,6 +48,7 @@ void GLWidget::initializeGL()
        static std::once_flag flag;
        std::call_once(flag, [this]{
                global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()));
+               global_mainwindow->mixer_created(global_mixer);
                global_mixer->start();
        });
        global_mixer->set_frame_ready_callback(output, [this]{
@@ -68,12 +71,17 @@ 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();
 }