MythVDPAUInterop: Better function pointer resolution

MythTV · May 23, 2019 · bd96412 · bd96412
1 parent 5421706
commit bd96412
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/mythtv/libs/libmythtv/mythvdpauinterop.cpp b/mythtv/libs/libmythtv/mythvdpauinterop.cpp
@@ -24,7 +24,7 @@ MythOpenGLInterop::Type MythVDPAUInterop::GetInteropType(MythCodecID CodecId,
     if (!Context)
         return Unsupported;
 
-    if (Context->hasExtension("GL_NV_vdpau_interop"))
+    if (Context->hasExtension("GL_NV_vdpau_interop") && MythVDPAUHelper::HaveVDPAU())
         return VDPAU;
     return Unsupported;
 }
@@ -81,11 +81,11 @@ bool MythVDPAUInterop::InitNV(AVVDPAUDeviceContext* DeviceContext)
         return true;
 
     OpenGLLocker locker(m_context);
-    m_initNV     = reinterpret_cast<MYTH_VDPAUINITNV>(m_context->getProcAddress("VDPAUInitNV"));
-    m_finiNV     = reinterpret_cast<MYTH_VDPAUFININV>(m_context->getProcAddress("VDPAUFiniNV"));
-    m_registerNV = reinterpret_cast<MYTH_VDPAUREGOUTSURFNV>(m_context->getProcAddress("VDPAURegisterOutputSurfaceNV"));
-    m_accessNV   = reinterpret_cast<MYTH_VDPAUSURFACCESSNV>(m_context->getProcAddress("VDPAUSurfaceAccessNV"));
-    m_mapNV      = reinterpret_cast<MYTH_VDPAUMAPSURFNV>(m_context->getProcAddress("VDPAUMapSurfacesNV"));
+    m_initNV     = reinterpret_cast<MYTH_VDPAUINITNV>(m_context->GetProcAddress("VDPAUInitNV"));
+    m_finiNV     = reinterpret_cast<MYTH_VDPAUFININV>(m_context->GetProcAddress("VDPAUFiniNV"));
+    m_registerNV = reinterpret_cast<MYTH_VDPAUREGOUTSURFNV>(m_context->GetProcAddress("VDPAURegisterOutputSurfaceNV"));
+    m_accessNV   = reinterpret_cast<MYTH_VDPAUSURFACCESSNV>(m_context->GetProcAddress("VDPAUSurfaceAccessNV"));
+    m_mapNV      = reinterpret_cast<MYTH_VDPAUMAPSURFNV>(m_context->GetProcAddress("VDPAUMapSurfacesNV"));
 
     if (m_initNV && m_finiNV && m_registerNV && m_accessNV && m_mapNV)
     {

diff --git a/mythtv/libs/libmythui/mythrender_opengl.h b/mythtv/libs/libmythui/mythrender_opengl.h
@@ -114,6 +114,7 @@ class MUI_PUBLIC MythRenderOpenGL : public QOpenGLContext, public QOpenGLFunctio
     void  Flush(void);
     void  SetBlend(bool enable);
     void  SetBackground(int r, int g, int b, int a);
+    QFunctionPointer GetProcAddress(const QString &Proc) const;
 
     static const GLuint kVertexSize;
     QOpenGLBuffer* CreateVBO(int Size, bool Release = true);
@@ -163,7 +164,6 @@ class MUI_PUBLIC MythRenderOpenGL : public QOpenGLContext, public QOpenGLFunctio
   protected:
     ~MythRenderOpenGL() override;
     void  Init2DState(void);
-    QFunctionPointer GetProcAddress(const QString &Proc) const;
     void  SetMatrixView(void);
     void  DeleteFramebuffers(void);
     bool  UpdateTextureVertices(MythGLTexture *Texture, const QRect &Source, const QRect &Destination);