Ticket #9248: libmythui-ogl-w32.diff

libs/libmythui/mythrender_opengl_defs.h

@@ -220 +220 @@
 typedef void ( * MYTH_GLDISABLEVERTEXATTRIBARRAY)
     (GLuint index);
 typedef void ( * MYTH_GLBINDATTRIBLOCATION)
-    (GLuint program, GLuint index, const GLcharARB *name);
+    (GLuint program, GLuint index, const GLchar *name);
 typedef void ( * MYTH_GLVERTEXATTRIB4F)
     (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
 

libs/libmythui/mythrender_opengl.h

@@ -9 +9 @@
 
 #ifdef _WIN32
 #include <GL/glext.h>
+typedef char GLchar;
 #endif
 
 #ifdef Q_WS_MACX

libs/libmythui/mythrender_opengl.cpp

@@ -1130 +1130 @@
 
     EnableTextures(tex);
     glBindTexture(m_textures[tex].m_type, tex);
-
+#ifdef GL_ARRAY_BUFFER
     m_glBindBufferARB(GL_ARRAY_BUFFER, m_textures[tex].m_vbo);
+#endif
     UpdateTextureVertices(tex, src, dst);
+#ifdef GL_ARRAY_BUFFER
     m_glBufferDataARB(GL_ARRAY_BUFFER, kVertexSize, NULL, GL_STREAM_DRAW);
     void* target = m_glMapBufferARB(GL_ARRAY_BUFFER, GL_WRITE_ONLY);
     if (target)
         memcpy(target, m_textures[tex].m_vertex_data, kVertexSize);
     m_glUnmapBufferARB(GL_ARRAY_BUFFER);
+#endif
 
     m_glEnableVertexAttribArray(VERTEX_INDEX);
     m_glEnableVertexAttribArray(TEXTURE_INDEX);
@@ -1154 +1157 @@
 
     m_glDisableVertexAttribArray(TEXTURE_INDEX);
     m_glDisableVertexAttribArray(VERTEX_INDEX);
+#ifdef GL_ARRAY_BUFFER
     m_glBindBufferARB(GL_ARRAY_BUFFER, 0);
+#endif
 }
 
 void MythRenderOpenGL::DrawBitmapLegacy(uint *textures, uint texture_count,
@@ -1269 +1274 @@
                                 VERTEX_SIZE * sizeof(GLfloat),
                                (const void *) kVertexOffset);
         glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+#ifdef GL_ARRAY_BUFFER
         m_glBindBufferARB(GL_ARRAY_BUFFER, 0);
+#endif
     }
 
     if (drawLine)
@@ -1285 +1292 @@
                                 VERTEX_SIZE * sizeof(GLfloat),
                                (const void *) kVertexOffset);
         glDrawArrays(GL_LINE_LOOP, 0, 4);
+#ifdef GL_ARRAY_BUFFER
         m_glBindBufferARB(GL_ARRAY_BUFFER, 0);
+#endif
     }
 
     m_glDisableVertexAttribArray(VERTEX_INDEX);
@@ -1777 +1786 @@
     const char* tmp[1] = { src.constData() };
     m_glShaderSource(result, 1, tmp, NULL);
     m_glCompileShader(result);
-    GLint compiled;
+    GLint compiled = 0;
+#ifdef GL_COMPILE_STATUS
     m_glGetShader(result, GL_COMPILE_STATUS, &compiled);
+#endif
     if (!compiled)
     {
+#ifdef GL_INFO_LOG_LENGTH
         GLint length = 0;
         m_glGetShader(result, GL_INFO_LOG_LENGTH, &length);
         if (length > 1)
@@ -1791 +1803 @@
             VERBOSE(VB_IMPORTANT, log);
             free(log);
         }
+#endif
         m_glDeleteShader(result);
         result = 0;
     }
@@ -1993 +2006 @@
         m_cachedVBOS.insert(ref, vbo);
         m_vboExpiry.append(ref);
 
+#ifdef GL_ARRAY_BUFFER
         m_glBindBufferARB(GL_ARRAY_BUFFER, vbo);
         m_glBufferDataARB(GL_ARRAY_BUFFER, kTextureOffset, NULL, GL_STREAM_DRAW);
         void* target = m_glMapBufferARB(GL_ARRAY_BUFFER, GL_WRITE_ONLY);
         if (target)
             memcpy(target, vertices, kTextureOffset);
         m_glUnmapBufferARB(GL_ARRAY_BUFFER);
-
+#endif
         ExpireVBOS(MAX_VERTEX_CACHE);
         return;
     }
 
+#ifdef GL_ARRAY_BUFFER
     m_glBindBufferARB(GL_ARRAY_BUFFER, m_cachedVBOS.value(ref));
+#endif
 }
 
 void MythRenderOpenGL::ExpireVBOS(uint max)