Skip to content

Commit

Permalink
OpenGL: Fix 2 cases of direct OpenGL calls
Browse files Browse the repository at this point in the history
- all calls need to use MythRenderOpenGL

(cherry picked from commit 0a45f67)
  • Loading branch information
mark-kendall committed Mar 8, 2020
1 parent 765aa0c commit 5607179
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/opengl/mythmediacodecinterop.cpp
Expand Up @@ -83,7 +83,7 @@ bool MythMediaCodecInterop::Initialise(QSize Size)

// Set the texture type
MythVideoTexture *texture = textures[0];
glBindTexture(GL_TEXTURE_EXTERNAL_OES, texture->m_textureId);
m_context->glBindTexture(GL_TEXTURE_EXTERNAL_OES, texture->m_textureId);

// Create surface
m_surfaceTexture = QAndroidJniObject("android/graphics/SurfaceTexture", "(I)V", texture->m_textureId);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/opengl/mythmmalinterop.cpp
Expand Up @@ -36,7 +36,7 @@ MythOpenGLInterop::Type MythMMALInterop::GetInteropType(VideoFrameType Format)
return Unsupported;

// MMAL interop only works with the closed source driver
QString renderer = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
QString renderer = reinterpret_cast<const char*>(context->glGetString(GL_RENDERER));
if (!renderer.contains("VideoCore", Qt::CaseInsensitive))
{
LOG(VB_GENERAL, LOG_WARNING, LOC +
Expand Down

0 comments on commit 5607179

Please sign in to comment.