80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

win_opengl: Added handling of initialization failures.

Browse Source
This commit is contained in:
ts-korhonen
2021-04-24 01:01:45 +03:00
parent 73cb94debf
commit b90601256d
1 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/win/win_opengl.c
View File

@@ -35,6 +35,7 @@
*/ */
#define UNICODE #define UNICODE
#include <Windows.h> #include <Windows.h>
#include <process.h>
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <SDL2/SDL_syswm.h> #include <SDL2/SDL_syswm.h>
#include <glad/glad.h> #include <glad/glad.h>
@@ -370,6 +371,34 @@ static void render_and_swap(gl_identifiers gl)
glUniform1i(gl.frame_count, frame_counter = (frame_counter + 1) & 1023); glUniform1i(gl.frame_count, frame_counter = (frame_counter + 1) & 1023);
} }
/**
* @brief Handle failure in OpenGL thread.
* Acts like a renderer until closing.
*/
static void opengl_fail()
{
if (window != NULL)
{
SDL_DestroyWindow(window);
window = NULL;
}
/* TODO: Notify user. */
HANDLE handles[] = { sync_objects.closing, sync_objects.blit_waiting };
while (1)
{
switch (WaitForMultipleObjects(2, handles, FALSE, INFINITE))
{
case WAIT_OBJECT_0: /* Close requested. End thread. */
_endthread();
case WAIT_OBJECT_0 + 1: /* Blitter is waiting, signal it to continue. */
SetEvent(blit_done);
}
}
}
/** /**
* @brief Main OpenGL thread proc. * @brief Main OpenGL thread proc.
* *
@@ -382,6 +411,9 @@ static void opengl_main(void* param)
window = SDL_CreateWindow("86Box OpenGL Renderer", 0, 0, resize_info.width, resize_info.height, SDL_WINDOW_OPENGL | SDL_WINDOW_BORDERLESS); window = SDL_CreateWindow("86Box OpenGL Renderer", 0, 0, resize_info.width, resize_info.height, SDL_WINDOW_OPENGL | SDL_WINDOW_BORDERLESS);
if (window == NULL)
opengl_fail();
/* Keep track of certain parameters, only changed in this thread to avoid race conditions */ /* Keep track of certain parameters, only changed in this thread to avoid race conditions */
int fullscreen = resize_info.fullscreen, video_width = INIT_WIDTH, video_height = INIT_HEIGHT, int fullscreen = resize_info.fullscreen, video_width = INIT_WIDTH, video_height = INIT_HEIGHT,
output_width = resize_info.width, output_height = resize_info.height, frametime = options.frametime; output_width = resize_info.width, output_height = resize_info.height, frametime = options.frametime;
@@ -390,8 +422,10 @@ static void opengl_main(void* param)
SDL_VERSION(&wmi.version); SDL_VERSION(&wmi.version);
SDL_GetWindowWMInfo(window, &wmi); SDL_GetWindowWMInfo(window, &wmi);
if (wmi.subsystem == SDL_SYSWM_WINDOWS) if (wmi.subsystem != SDL_SYSWM_WINDOWS)
window_hwnd = wmi.info.win.window; opengl_fail();
window_hwnd = wmi.info.win.window;
if (!fullscreen) if (!fullscreen)
set_parent_binding(1); set_parent_binding(1);
@@ -400,9 +434,16 @@ static void opengl_main(void* param)
SDL_GLContext context = SDL_GL_CreateContext(window); SDL_GLContext context = SDL_GL_CreateContext(window);
if (context == NULL)
opengl_fail();
SDL_GL_SetSwapInterval(options.vsync); SDL_GL_SetSwapInterval(options.vsync);
gladLoadGLLoader(SDL_GL_GetProcAddress); if (!gladLoadGLLoader(SDL_GL_GetProcAddress))
{
SDL_GL_DeleteContext(context);
opengl_fail();
}
gl_identifiers gl = initialize_glcontext(); gl_identifiers gl = initialize_glcontext();