zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-13 07:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Use SDL_GL_GetProcAddress on platforms where the SDL is being used. Since SDL initialized OpenGL for us, it is the only reliable way of retrieving proc addresses.

Browse source 
- Check if ogl_LoadFunctions failed and make OpenGLSWFrameBuffer gracefully recover from that
This commit is contained in:
Magnus Norddahl 2017-04-07 02:17:34 +02:00 committed by Rachael Alexanderson
parent 74faacd218
commit e690de25a8
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gl/system/gl_load.c
View file

@ -85,7 +85,9 @@ static PROC WinGetProcAddress(const char *name)
#define IntGetProcAddress(name) AppleGLGetProcAddress(name) #define IntGetProcAddress(name) AppleGLGetProcAddress(name)
#else #else
#if defined(__sgi) || defined(__sun) || defined(__unix__) #if defined(__sgi) || defined(__sun) || defined(__unix__)
#define IntGetProcAddress(name) PosixGetProcAddress((const GLubyte*)name) void* SDL_GL_GetProcAddress(const char* proc);
#define IntGetProcAddress(name) SDL_GL_GetProcAddress((const char*)name)
//#define IntGetProcAddress(name) PosixGetProcAddress((const GLubyte*)name)
/* END OF MANUAL CHANGES, DO NOT REMOVE! */ /* END OF MANUAL CHANGES, DO NOT REMOVE! */
#else /* GLX */ #else /* GLX */
#include <GL/glx.h> #include <GL/glx.h>

6
src/gl/system/gl_swframebuffer.cpp
View file

@ -194,7 +194,11 @@ OpenGLSWFrameBuffer::OpenGLSWFrameBuffer(void *hMonitor, int width, int height,
static bool first = true; static bool first = true;
if (first) if (first)
{ {
ogl_LoadFunctions(); if (ogl_LoadFunctions() == ogl_LOAD_FAILED)
{
Printf("OpenGL load failed. No OpenGL acceleration will be used.\n");
return;
}
} }
gl_LoadExtensions(); gl_LoadExtensions();
InitializeState(); InitializeState();