Mercurial > sdl-ios-xcode
view src/video/x11/SDL_x11gl_c.h @ 1120:8e1fde455471
Patch by me to fix crash described below.
--ryan.
To: sdl@libsdl.org
From: Rainer Deyke <rainerd@eldwood.com>
Date: Tue, 16 Aug 2005 01:08:18 -0600
Subject: [SDL] Bug report: SDL_CreateRGBSurface with SDL_HWSURFACE crashes
If SDL is in full-screen mode with a hardware video surface on OS X,
SDL_CreateRGBSurface with SDL_HWSURFACE crashes. The crash occurs on
line 109 of SDL_Surface.c. This was tested on OS X 10.3.9 with both SDL
1.2.8 and the latest CVS. Here is a small C++ program that demonstrates
the problem:
#include "SDL.h"
#include <stdio.h>
namespace {
void wait_for_key()
{
SDL_Event e;
printf("%d\n", SDL_GetAppState());
while (SDL_WaitEvent(&e)) {
if (e.type == SDL_KEYDOWN || e.type == SDL_QUIT) return;
}
}
}
int main(int, char *[])
{
SDL_Init(SDL_INIT_VIDEO);
SDL_Surface *screen
= SDL_SetVideoMode(640, 480, 32, SDL_FULLSCREEN | SDL_HWSURFACE);
SDL_Surface *s = SDL_CreateRGBSurface(SDL_HWSURFACE, 640, 480, 32,
screen->format->Rmask, screen->format->Gmask,
screen->format->Bmask, screen->format->Amask);
wait_for_key();
if (s) SDL_FreeSurface(s);
SDL_Quit();
printf("Success!\n");
return 0;
}
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Thu, 18 Aug 2005 06:46:32 +0000 |
| parents | b8d311d90021 |
| children | 2bd4cec0de63 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2004 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif #ifdef HAVE_OPENGL #include <GL/glx.h> #include <dlfcn.h> #if defined(__OpenBSD__) && !defined(__ELF__) #define dlsym(x,y) dlsym(x, "_" y) #endif #endif #include "SDL_sysvideo.h" struct SDL_PrivateGLData { int gl_active; /* to stop switching drivers while we have a valid context */ #ifdef HAVE_OPENGL GLXContext glx_context; /* Current GL context */ XVisualInfo* glx_visualinfo; /* XVisualInfo* returned by glXChooseVisual */ void * (*glXGetProcAddress)(const GLubyte *procName); XVisualInfo* (*glXChooseVisual) ( Display* dpy, int screen, int* attribList ); GLXContext (*glXCreateContext) ( Display* dpy, XVisualInfo* vis, GLXContext shareList, Bool direct ); void (*glXDestroyContext) ( Display* dpy, GLXContext ctx ); Bool (*glXMakeCurrent) ( Display* dpy, GLXDrawable drawable, GLXContext ctx ); void (*glXSwapBuffers) ( Display* dpy, GLXDrawable drawable ); int (*glXGetConfig) ( Display* dpy, XVisualInfo* visual_info, int attrib, int* value ); void (*glXReleaseBuffersMESA) ( Display* dpy, GLXDrawable drawable ); const char *(*glXQueryExtensionsString) ( Display* dpy, int screen); #endif /* HAVE_OPENGL */ }; /* Old variable names */ #define gl_active (this->gl_data->gl_active) #define glx_context (this->gl_data->glx_context) #define glx_visualinfo (this->gl_data->glx_visualinfo) /* OpenGL functions */ extern XVisualInfo *X11_GL_GetVisual(_THIS); extern int X11_GL_CreateWindow(_THIS, int w, int h); extern int X11_GL_CreateContext(_THIS); extern void X11_GL_Shutdown(_THIS); #ifdef HAVE_OPENGL extern int X11_GL_MakeCurrent(_THIS); extern int X11_GL_GetAttribute(_THIS, SDL_GLattr attrib, int* value); extern void X11_GL_SwapBuffers(_THIS); extern int X11_GL_LoadLibrary(_THIS, const char* path); extern void *X11_GL_GetProcAddress(_THIS, const char* proc); #endif extern void X11_GL_UnloadLibrary(_THIS);