mirror of
https://github.com/Relintai/sdl2_frt.git
synced 2024-12-20 22:16:49 +01:00
0e45984fa0
The internal function SDL_EGL_LoadLibrary() did not delete and remove a mostly uninitialized data structure if loading the library first failed. A later try to use EGL then skipped initialization and assumed it was previously successful because the data structure now already existed. This led to at least one crash in the internal function SDL_EGL_ChooseConfig() because a NULL pointer was dereferenced to make a call to eglBindAPI().
110 lines
3.8 KiB
C
110 lines
3.8 KiB
C
/*
|
|
Simple DirectMedia Layer
|
|
Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
|
|
|
This software is provided 'as-is', without any express or implied
|
|
warranty. In no event will the authors be held liable for any damages
|
|
arising from the use of this software.
|
|
|
|
Permission is granted to anyone to use this software for any purpose,
|
|
including commercial applications, and to alter it and redistribute it
|
|
freely, subject to the following restrictions:
|
|
|
|
1. The origin of this software must not be misrepresented; you must not
|
|
claim that you wrote the original software. If you use this software
|
|
in a product, an acknowledgment in the product documentation would be
|
|
appreciated but is not required.
|
|
2. Altered source versions must be plainly marked as such, and must not be
|
|
misrepresented as being the original software.
|
|
3. This notice may not be removed or altered from any source distribution.
|
|
*/
|
|
#include "../../SDL_internal.h"
|
|
|
|
#if SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_OPENGL_EGL
|
|
|
|
#include "SDL_x11video.h"
|
|
#include "SDL_x11opengles.h"
|
|
#include "SDL_x11opengl.h"
|
|
|
|
/* EGL implementation of SDL OpenGL support */
|
|
|
|
int
|
|
X11_GLES_LoadLibrary(_THIS, const char *path)
|
|
{
|
|
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
|
|
|
|
/* If the profile requested is not GL ES, switch over to X11_GL functions */
|
|
if (_this->gl_config.profile_mask != SDL_GL_CONTEXT_PROFILE_ES) {
|
|
#if SDL_VIDEO_OPENGL_GLX
|
|
X11_GLES_UnloadLibrary(_this);
|
|
_this->GL_LoadLibrary = X11_GL_LoadLibrary;
|
|
_this->GL_GetProcAddress = X11_GL_GetProcAddress;
|
|
_this->GL_UnloadLibrary = X11_GL_UnloadLibrary;
|
|
_this->GL_CreateContext = X11_GL_CreateContext;
|
|
_this->GL_MakeCurrent = X11_GL_MakeCurrent;
|
|
_this->GL_SetSwapInterval = X11_GL_SetSwapInterval;
|
|
_this->GL_GetSwapInterval = X11_GL_GetSwapInterval;
|
|
_this->GL_SwapWindow = X11_GL_SwapWindow;
|
|
_this->GL_DeleteContext = X11_GL_DeleteContext;
|
|
return X11_GL_LoadLibrary(_this, path);
|
|
#else
|
|
return SDL_SetError("SDL not configured with OpenGL/GLX support");
|
|
#endif
|
|
}
|
|
|
|
return SDL_EGL_LoadLibrary(_this, path, (NativeDisplayType) data->display);
|
|
}
|
|
|
|
XVisualInfo *
|
|
X11_GLES_GetVisual(_THIS, Display * display, int screen)
|
|
{
|
|
|
|
XVisualInfo *egl_visualinfo = NULL;
|
|
EGLint visual_id;
|
|
XVisualInfo vi_in;
|
|
int out_count;
|
|
|
|
if (!_this->egl_data) {
|
|
/* The EGL library wasn't loaded, SDL_GetError() should have info */
|
|
return NULL;
|
|
}
|
|
|
|
if (_this->egl_data->eglGetConfigAttrib(_this->egl_data->egl_display,
|
|
_this->egl_data->egl_config,
|
|
EGL_NATIVE_VISUAL_ID,
|
|
&visual_id) == EGL_FALSE || !visual_id) {
|
|
/* Use the default visual when all else fails */
|
|
vi_in.screen = screen;
|
|
egl_visualinfo = X11_XGetVisualInfo(display,
|
|
VisualScreenMask,
|
|
&vi_in, &out_count);
|
|
} else {
|
|
vi_in.screen = screen;
|
|
vi_in.visualid = visual_id;
|
|
egl_visualinfo = X11_XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &vi_in, &out_count);
|
|
}
|
|
|
|
return egl_visualinfo;
|
|
}
|
|
|
|
SDL_GLContext
|
|
X11_GLES_CreateContext(_THIS, SDL_Window * window)
|
|
{
|
|
SDL_GLContext context;
|
|
SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
|
|
Display *display = data->videodata->display;
|
|
|
|
X11_XSync(display, False);
|
|
context = SDL_EGL_CreateContext(_this, data->egl_surface);
|
|
X11_XSync(display, False);
|
|
|
|
return context;
|
|
}
|
|
|
|
SDL_EGL_SwapWindow_impl(X11)
|
|
SDL_EGL_MakeCurrent_impl(X11)
|
|
|
|
#endif /* SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_OPENGL_EGL */
|
|
|
|
/* vi: set ts=4 sw=4 expandtab: */
|