We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] proposed patch

patch (text/plain), 2.04 KB, created by Alexander Sabourenkov on 2012-06-02 03:00:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Sabourenkov

Created: 2012-06-02 03:00:49 UTC

Size: 2.04 KB

patch

obsolete

># HG changeset patch
># User Alexander Sabourenkov <screwdriver@lxnt.info>
># Date 1338630434 -14400
># Node ID a6e11d95389469809fc0eae8459943358cfda5c8
># Parent  d3fa10b2d16e619bf208f4dec34c0522dbbdc834
>use glGetStringi when available
>
>diff -r d3fa10b2d16e -r a6e11d953894 src/video/SDL_video.c
>--- a/src/video/SDL_video.c	Fri Jun 01 20:31:50 2012 -0400
>+++ b/src/video/SDL_video.c	Sat Jun 02 13:47:14 2012 +0400
>@@ -2183,7 +2183,9 @@
> SDL_GL_ExtensionSupported(const char *extension)
> {
> #if SDL_VIDEO_OPENGL || SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
>+    void (APIENTRY * glGetIntegervFunc) (GLenum, GLint *);
>     const GLubyte *(APIENTRY * glGetStringFunc) (GLenum);
>+    const GLubyte *(APIENTRY * glGetStringiFunc) (GLenum, GLuint);
>     const char *extensions;
>     const char *start;
>     const char *where, *terminator;
>@@ -2198,15 +2200,32 @@
>     if (start && *start == '0') {
>         return SDL_FALSE;
>     }
>+    
>+    glGetIntegervFunc = SDL_GL_GetProcAddress("glGetIntegerv");
>+    glGetStringiFunc = SDL_GL_GetProcAddress("glGetStringi");
>+    glGetStringFunc = SDL_GL_GetProcAddress("glGetString");
>+    
>     /* Lookup the available extensions */
>-    glGetStringFunc = SDL_GL_GetProcAddress("glGetString");
>+    if (glGetStringiFunc && glGetIntegervFunc) {
>+        GLint num; 
>+        GLuint i;
>+        
>+        glGetIntegervFunc(GL_NUM_EXTENSIONS, &num);
>+	for(i = 0; i < num; i ++) {
>+            extensions = (const char *) glGetStringiFunc(GL_EXTENSIONS, i);
>+            if (0 == SDL_strcmp(extension, extensions)) {
>+                return SDL_TRUE;
>+            }
>+        }
>+        return SDL_FALSE;
>+    } 
>     if (glGetStringFunc) {
>-        extensions = (const char *) glGetStringFunc(GL_EXTENSIONS);
>-    } else {
>-        extensions = NULL;
>-    }
>+            extensions = (const char *) glGetStringFunc(GL_EXTENSIONS);
>+        } else {
>+            extensions = NULL;
>+        }
>     if (!extensions) {
>-        return SDL_FALSE;
>+            return SDL_FALSE;
>     }
>     /*
>      * It takes a bit of care to be fool-proof about parsing the OpenGL

Actions: View | Diff

Attachments on bug 1510: 865

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.