thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hotswap-legacy-gl' into 'master'

Browse source 
Restore renderer swapping to and from legacy GL

See merge request KartKrew/Kart!1026
This commit is contained in:
toaster 2023-03-14 22:56:02 +00:00
commit b3e803a294
3 changed files with 48 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
src/sdl/i_video.cpp
View file

@ -1364,6 +1364,11 @@ void VID_PrepareModeList(void)
static void init_imgui()
{
if (ImGui::GetCurrentContext() != NULL)
{
return;
}
ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO(); (void)io;
io.IniFilename = NULL;
@ -1384,22 +1389,27 @@ static SDL_bool Impl_CreateContext(void)
#ifdef HWRENDER
if (rendermode == render_opengl)
{
if (!sdlglcontext)
sdlglcontext = SDL_GL_CreateContext(window);
if (sdlglcontext == NULL)
if (!g_legacy_gl_context)
{
SDL_GL_ResetAttributes();
g_legacy_gl_context = SDL_GL_CreateContext(window);
}
if (g_legacy_gl_context == NULL)
{
SDL_DestroyWindow(window);
I_Error("Failed to create a GL context: %s\n", SDL_GetError());
I_Error("Failed to create a Legacy GL context: %s\n", SDL_GetError());
}
init_imgui();
SDL_GL_MakeCurrent(window, sdlglcontext);
SDL_GL_MakeCurrent(window, g_legacy_gl_context);
return SDL_TRUE;
}
#endif
// RHI always uses OpenGL 3.2 Core (for now)
if (!sdlglcontext)
{
SDL_GL_ResetAttributes();
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
@ -1408,15 +1418,18 @@ static SDL_bool Impl_CreateContext(void)
if (sdlglcontext == NULL)
{
SDL_DestroyWindow(window);
I_Error("Failed to create a GL context: %s\n", SDL_GetError());
I_Error("Failed to create an RHI GL context: %s\n", SDL_GetError());
}
init_imgui();
SDL_GL_MakeCurrent(window, sdlglcontext);
std::unique_ptr<rhi::SdlGlCorePlatform> platform = std::make_unique<rhi::SdlGlCorePlatform>();
platform->window = window;
g_rhi = std::make_unique<rhi::GlCoreRhi>(std::move(platform), reinterpret_cast<rhi::GlLoadFunc>(SDL_GL_GetProcAddress));
g_rhi_generation += 1;
if (!g_rhi)
{
std::unique_ptr<rhi::SdlGlCorePlatform> platform = std::make_unique<rhi::SdlGlCorePlatform>();
platform->window = window;
g_rhi = std::make_unique<rhi::GlCoreRhi>(std::move(platform), reinterpret_cast<rhi::GlLoadFunc>(SDL_GL_GetProcAddress));
g_rhi_generation += 1;
}
return SDL_TRUE;
}
@ -1424,29 +1437,11 @@ static SDL_bool Impl_CreateContext(void)
void VID_CheckGLLoaded(rendermode_t oldrender)
{
(void)oldrender;
#ifdef HWRENDER
if (vid.glstate == VID_GL_LIBRARY_ERROR) // Well, it didn't work the first time anyway.
{
CONS_Alert(CONS_ERROR, "OpenGL never loaded\n");
rendermode = oldrender;
if (chosenrendermode == render_opengl) // fallback to software
rendermode = render_soft;
if (setrenderneeded)
{
CV_StealthSetValue(&cv_renderer, oldrender);
setrenderneeded = 0;
}
}
#endif
}
boolean VID_CheckRenderer(void)
{
boolean rendererchanged = false;
boolean contextcreated = false;
#ifdef HWRENDER
rendermode_t oldrenderer = rendermode;
#endif
if (dedicated)
return false;
@ -1456,41 +1451,20 @@ boolean VID_CheckRenderer(void)
rendermode = static_cast<rendermode_t>(setrenderneeded);
rendererchanged = true;
#ifdef HWRENDER
if (rendermode == render_opengl)
if (rendererchanged)
{
VID_CheckGLLoaded(oldrenderer);
// Initialise OpenGL before calling SDLSetMode!!!
// This is because SDLSetMode calls OglSdlSurface.
if (vid.glstate == VID_GL_LIBRARY_NOTLOADED)
Impl_CreateContext();
#ifdef HWRENDER
if (rendermode == render_opengl)
{
VID_StartupOpenGL();
// Loaded successfully!
if (vid.glstate == VID_GL_LIBRARY_LOADED)
if (vid.glstate != VID_GL_LIBRARY_LOADED)
{
// Destroy the current window, if it exists.
if (window)
{
SDL_DestroyWindow(window);
window = NULL;
}
// Create a new window.
Impl_CreateWindow(static_cast<SDL_bool>(USE_FULLSCREEN));
// From there, the OpenGL context was already created.
contextcreated = true;
rendererchanged = false;
}
}
else if (vid.glstate == VID_GL_LIBRARY_ERROR)
rendererchanged = false;
}
#endif
if (!contextcreated)
Impl_CreateContext();
}
setrenderneeded = 0;
}
@ -1770,16 +1744,17 @@ void VID_StartupOpenGL(void)
*(void**)&HWD.pfnSetShaderInfo = hwSym("SetShaderInfo",NULL);
*(void**)&HWD.pfnLoadCustomShader = hwSym("LoadCustomShader",NULL);
vid.glstate = HWD.pfnInit() ? VID_GL_LIBRARY_LOADED : VID_GL_LIBRARY_ERROR; // let load the OpenGL library
if (vid.glstate == VID_GL_LIBRARY_ERROR)
{
rendermode = render_soft;
setrenderneeded = 0;
}
glstartup = true;
}
// For RHI-Legacy GL compatibility: Init always fetches GL functions, but only dlsym's libraries once.
vid.glstate = HWD.pfnInit() ? VID_GL_LIBRARY_LOADED : VID_GL_LIBRARY_ERROR; // let load the OpenGL library
if (vid.glstate == VID_GL_LIBRARY_ERROR)
{
rendermode = render_soft;
setrenderneeded = 0;
}
#endif
}

8
src/sdl/ogl_sdl.c
View file

@ -73,6 +73,7 @@ PFNglGetString pglGetString;
INT32 oglflags = 0;
void *GLUhandle = NULL;
SDL_GLContext sdlglcontext = 0;
SDL_GLContext g_legacy_gl_context = 0;
void *GetGLFunc(const char *proc)
{
@ -89,9 +90,15 @@ void *GetGLFunc(const char *proc)
boolean LoadGL(void)
{
#ifndef STATIC_OPENGL
static boolean loaded_libraries = false;
const char *OGLLibname = NULL;
const char *GLULibname = NULL;
if (loaded_libraries)
{
return SetupGLfunc();
}
if (M_CheckParm("-OGLlib") && M_IsNextParm())
OGLLibname = M_GetNextParm();
@ -140,6 +147,7 @@ boolean LoadGL(void)
CONS_Alert(CONS_ERROR, "Could not load GLU Library\n");
CONS_Printf("If you know what is the GLU library's name, use -GLUlib\n");;
}
loaded_libraries = true;
#endif
return SetupGLfunc();
}

1
src/sdl/ogl_sdl.h
View file

@ -35,6 +35,7 @@ boolean OglSdlSurface(INT32 w, INT32 h);
void OglSdlFinishUpdate(boolean vidwait);
extern SDL_GLContext sdlglcontext;
extern SDL_GLContext g_legacy_gl_context;
extern Uint16 realwidth;
extern Uint16 realheight;