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