Permalink
Browse files

Fix compilation w/Qt5 & OpenGL.

  • Loading branch information...
daniel-kristjansson committed May 5, 2013
1 parent 62538dc commit fd1d12d86bb38c2027315138df918ca7a1fca77b
Showing with 6 additions and 4 deletions.
  1. +2 −2 mythtv/libs/libmythtv/libmythtv.pro
  2. +4 −2 mythtv/libs/libmythui/mythrender_opengl.cpp
@@ -395,8 +395,8 @@ using_frontend {
DEFINES += FFTW3_SUPPORT
HEADERS += visualisations/videovisualspectrum.h
SOURCES += visualisations/videovisualspectrum.cpp
using_opengl: HEADERS += videovisualcircles.h
using_opengl: SOURCES += videovisualcircles.cpp
using_opengl: HEADERS += visualisations/videovisualcircles.h
using_opengl: SOURCES += visualisations/videovisualcircles.cpp
}
using_quartz_video: DEFINES += USING_QUARTZ_VIDEO
@@ -793,14 +793,16 @@ void MythRenderOpenGL::InitProcs(void)
void* MythRenderOpenGL::GetProcAddress(const QString &proc) const
{
// TODO FIXME - this should really return a void(*) not void*
static const QString exts[4] = { "", "ARB", "EXT", "OES" };
void *result;
for (int i = 0; i < 4; i++)
{
result = QLibrary::resolve("libGLESv2", (proc + exts[i]).toLatin1().data());
result = reinterpret_cast<void*>(
QLibrary::resolve("libGLESv2", (proc + exts[i]).toLatin1().data()));
if (result)
break;
result = getProcAddress(proc + exts[i]);
result = reinterpret_cast<void*>(getProcAddress(proc + exts[i]));
if (result)
break;
}

0 comments on commit fd1d12d

Please sign in to comment.