- [Psy-X] allow to fallback OpenGL context from 3.3 to 3.0

This commit is contained in:
Ilya Shurumov 2020-12-25 18:30:05 +00:00
parent 29aeac35dd
commit 0f78957f4d

View File

@ -152,16 +152,62 @@ int GR_InitialiseGLContext(char* windowName, int fullscreen)
g_window = SDL_CreateWindow(windowName, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, g_windowWidth, g_windowHeight, windowFlags);
#if defined(RENDERER_OGL)
SDL_GL_CreateContext(g_window);
#endif
if (g_window == NULL)
{
eprinterr("Failed to initialise SDL window or GL context!\n");
eprinterr("Failed to initialise SDL window!\n");
return 0;
}
#if defined(OGLES)
#if defined(__ANDROID__)
//Override to full screen.
SDL_DisplayMode displayMode;
if (SDL_GetCurrentDisplayMode(0, &displayMode) == 0)
{
screenWidth = displayMode.w;
windowWidth = displayMode.w;
screenHeight = displayMode.h;
windowHeight = displayMode.h;
}
#endif
//SDL_GL_SetAttribute(SDL_GL_CONTEXT_EGL, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, OGLES_VERSION);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
if(!SDL_GL_CreateContext(g_window))
{
eprinterr("Failed to initialise - OpenGL ES %d.x is not supported.\n", OGLES_VERSION);
return 0;
}
#elif defined(RENDERER_OGL)
int major_version = 3;
int minor_version = 3;
int profile = SDL_GL_CONTEXT_PROFILE_CORE;
// find best OpenGL version
do
{
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, major_version);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minor_version);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profile);
if (SDL_GL_CreateContext(g_window))
break;
minor_version--;
} while (minor_version >= 0);
if (minor_version == -1)
{
eprinterr("Failed to initialise - OpenGL 3.x is not supported. Please update video drivers.\n");
return 0;
}
#endif
return 1;
}
#endif
@ -197,29 +243,6 @@ int GR_InitialiseRender(char* windowName, int width, int height, int fullscreen)
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 0);
#endif
#if defined(OGLES)
#if defined(__ANDROID__)
//Override to full screen.
SDL_DisplayMode displayMode;
if (SDL_GetCurrentDisplayMode(0, &displayMode) == 0)
{
screenWidth = displayMode.w;
windowWidth = displayMode.w;
screenHeight = displayMode.h;
windowHeight = displayMode.h;
}
#endif
//SDL_GL_SetAttribute(SDL_GL_CONTEXT_EGL, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, OGLES_VERSION);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
#elif defined(RENDERER_OGL)
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
#endif
#if defined(RENDERER_OGL) || defined(OGLES)
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);