Fixes for MythRenderEGL (Pi)

MythTV · Jan 19, 2019 · 22e6f31 · 22e6f31
1 parent a450986
commit 22e6f31
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/mythtv/libs/libmythtv/videoout_omx.cpp b/mythtv/libs/libmythtv/videoout_omx.cpp
@@ -160,7 +160,7 @@ class GlOsdThread : public MThread
                     rectsChanged = false;
                 }
                 m_EGLRender->makeCurrent();
-                m_EGLRender->BindFramebuffer(0);
+                m_EGLRender->BindFramebuffer(nullptr);
                 m_Painter->DrawImage(m_bounds, m_osdImage,
                                   m_bounds, 255);
                 m_EGLRender->swapBuffers();
@@ -938,7 +938,7 @@ bool VideoOutputOMX::DisplayOSD(VideoFrame *frame, OSD *osd)
         && m_context && m_osdpainter)
     {
         m_context->makeCurrent();
-        m_context->BindFramebuffer(0);
+        m_context->BindFramebuffer(nullptr);
 
         QRect bounds = GetTotalOSDBounds();
         bool redraw = false;

diff --git a/mythtv/libs/libmythui/mythrender_opengl.h b/mythtv/libs/libmythui/mythrender_opengl.h
@@ -115,11 +115,10 @@ class MUI_PUBLIC MythRenderOpenGL : public QOpenGLContext, protected QOpenGLFunc
 
     // These functions are not virtual in the base QOpenGLContext
     // class, so these are not overrides but new functions.
-    // TODO remove
-    void makeCurrent();
-    void doneCurrent();
+    virtual void makeCurrent();
+    virtual void doneCurrent();
+    virtual void swapBuffers();
 
-    void swapBuffers();
     void setWidget(QWidget *Widget);
     bool IsDirectRendering() const;
     bool  Init(void);