src/video/x11/SDL_x11opengl.h
author Sam Lantinga <slouken@libsdl.org>
Tue, 23 Jul 2013 19:20:03 -0700
changeset 7512 462839f2f408
parent 6885 700f1b25f77f
child 7659 ac4ce59c40e7
permissions -rw-r--r--
Fix for recent GLX error bug

Lee Salzman

I messed up in the patch I sent you regarding gobbling up the GLX error codes signaled when trying to create a context. After reading the spec I realized those error codes are relative to a base error that needs to be queried when setting up the GLX extension...

So I have made a patch that fixes it for a user I had who was still getting the bug with my old patch.

Without this patch my previous one won't work, so it is recommended to merge this...
     1 /*
     2   Simple DirectMedia Layer
     3   Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
     4 
     5   This software is provided 'as-is', without any express or implied
     6   warranty.  In no event will the authors be held liable for any damages
     7   arising from the use of this software.
     8 
     9   Permission is granted to anyone to use this software for any purpose,
    10   including commercial applications, and to alter it and redistribute it
    11   freely, subject to the following restrictions:
    12 
    13   1. The origin of this software must not be misrepresented; you must not
    14      claim that you wrote the original software. If you use this software
    15      in a product, an acknowledgment in the product documentation would be
    16      appreciated but is not required.
    17   2. Altered source versions must be plainly marked as such, and must not be
    18      misrepresented as being the original software.
    19   3. This notice may not be removed or altered from any source distribution.
    20 */
    21 #include "SDL_config.h"
    22 
    23 #ifndef _SDL_x11opengl_h
    24 #define _SDL_x11opengl_h
    25 
    26 #if SDL_VIDEO_OPENGL_GLX
    27 #include "SDL_opengl.h"
    28 #include <GL/glx.h>
    29 
    30 struct SDL_GLDriverData
    31 {
    32     int errorBase, eventBase;
    33 
    34     SDL_bool HAS_GLX_EXT_visual_rating;
    35     SDL_bool HAS_GLX_EXT_visual_info;
    36     SDL_bool HAS_GLX_EXT_swap_control_tear;
    37 
    38     Bool (*glXQueryExtension) (Display*,int*,int*);
    39     void *(*glXGetProcAddress) (const GLubyte*);
    40     XVisualInfo *(*glXChooseVisual) (Display*,int,int*);
    41     GLXContext (*glXCreateContext) (Display*,XVisualInfo*,GLXContext,Bool);
    42     void (*glXDestroyContext) (Display*, GLXContext);
    43     Bool(*glXMakeCurrent) (Display*,GLXDrawable,GLXContext);
    44     void (*glXSwapBuffers) (Display*, GLXDrawable);
    45     void (*glXQueryDrawable) (Display*,GLXDrawable,int,unsigned int*);
    46     void (*glXSwapIntervalEXT) (Display*,GLXDrawable,int);
    47     int (*glXSwapIntervalSGI) (int);
    48     int (*glXSwapIntervalMESA) (int);
    49     int (*glXGetSwapIntervalMESA) (void);
    50 };
    51 
    52 /* OpenGL functions */
    53 extern int X11_GL_LoadLibrary(_THIS, const char *path);
    54 extern void *X11_GL_GetProcAddress(_THIS, const char *proc);
    55 extern void X11_GL_UnloadLibrary(_THIS);
    56 extern XVisualInfo *X11_GL_GetVisual(_THIS, Display * display, int screen);
    57 extern SDL_GLContext X11_GL_CreateContext(_THIS, SDL_Window * window);
    58 extern int X11_GL_MakeCurrent(_THIS, SDL_Window * window,
    59                               SDL_GLContext context);
    60 extern int X11_GL_SetSwapInterval(_THIS, int interval);
    61 extern int X11_GL_GetSwapInterval(_THIS);
    62 extern void X11_GL_SwapWindow(_THIS, SDL_Window * window);
    63 extern void X11_GL_DeleteContext(_THIS, SDL_GLContext context);
    64 
    65 #endif /* SDL_VIDEO_OPENGL_GLX */
    66 
    67 #endif /* _SDL_x11opengl_h */
    68 
    69 /* vi: set ts=4 sw=4 expandtab: */