Ticket #1612: max_text.diff

libs/libmythui/mythpainter_ogl.h

@@ -48 +48 @@
     list<QString> m_StringExpireList;
 
     int q_gl_texture;
+    int m_maxTexDim;
     bool texture_rects;
 };
 

libs/libmythui/mythpainter_ogl.cpp

@@ -62 +62 @@
     glOrtho(0, parent->width(), parent->height(), 0, -999999, 999999);
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
+
+    GLint param;
+    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &param);
+    m_maxTexDim = param;
+
     //glTranslatef(0.2, 0.2, 0.0);
 }
 
@@ -82 +87 @@
 int MythOpenGLPainter::NearestGLTextureSize(int v)
 {
     int n = 0, last = 0;
+    int s;
 
     for (int s = 0; s < 32; ++s) 
     {
@@ -93 +99 @@
     }
 
     if (n > 1)
-        return 1 << (last + 1);
+        s = 1 << (last + 1);
+    else
+        s = 1 << last;
+    
+    if (s > m_maxTexDim)
+        s = m_maxTexDim;
 
-    return 1 << last;
+    return s;
 }
 
 void MythOpenGLPainter::RemoveImageFromCache(MythImage *im)