godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Propogate errors when creating an OpenGL context fails in X11

Browse Source
This commit is contained in:
clayjohn
2023-03-07 09:24:05 -08:00
parent 3695fe5a57
commit e7ea3ef531
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/linuxbsd/x11/display_server_x11.cpp
View File

@@ -4873,7 +4873,9 @@ DisplayServerX11::WindowID DisplayServerX11::_create_window(WindowMode p_mode, V
#ifdef GLES3_ENABLED #ifdef GLES3_ENABLED
if (gl_manager) { if (gl_manager) {
visualInfo = gl_manager->get_vi(x11_display); Error err;
visualInfo = gl_manager->get_vi(x11_display, err);
ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Can't acquire visual info from display.");
vi_selected = true; vi_selected = true;
} }
#endif #endif

23
platform/linuxbsd/x11/gl_manager_x11.cpp
View File

@@ -83,8 +83,13 @@ int GLManager_X11::_find_or_create_display(Display *p_x11_display) {
d.context = memnew(GLManager_X11_Private); d.context = memnew(GLManager_X11_Private);
d.context->glx_context = nullptr; d.context->glx_context = nullptr;
//Error err = _create_context(d); Error err = _create_context(d);
_create_context(d);
if (err != OK) {
_displays.remove_at(new_display_id);
return -1;
}
return new_display_id; return new_display_id;
} }
@@ -191,8 +196,14 @@ Error GLManager_X11::_create_context(GLDisplay &gl_display) {
return OK; return OK;
} }
XVisualInfo GLManager_X11::get_vi(Display *p_display) { XVisualInfo GLManager_X11::get_vi(Display *p_display, Error &r_error) {
return _displays[_find_or_create_display(p_display)].x_vi; int display_id = _find_or_create_display(p_display);
if (display_id < 0) {
r_error = FAILED;
return XVisualInfo();
}
r_error = OK;
return _displays[display_id].x_vi;
} }
Error GLManager_X11::window_create(DisplayServer::WindowID p_window_id, ::Window p_window, Display *p_display, int p_width, int p_height) { Error GLManager_X11::window_create(DisplayServer::WindowID p_window_id, ::Window p_window, Display *p_display, int p_width, int p_height) {
@@ -211,6 +222,10 @@ Error GLManager_X11::window_create(DisplayServer::WindowID p_window_id, ::Window
win.x11_window = p_window; win.x11_window = p_window;
win.gldisplay_id = _find_or_create_display(p_display); win.gldisplay_id = _find_or_create_display(p_display);
if (win.gldisplay_id == -1) {
return FAILED;
}
// the display could be invalid .. check NYI // the display could be invalid .. check NYI
GLDisplay &gl_display = _displays[win.gldisplay_id]; GLDisplay &gl_display = _displays[win.gldisplay_id];
::Display *x11_display = gl_display.x11_display; ::Display *x11_display = gl_display.x11_display;

2
platform/linuxbsd/x11/gl_manager_x11.h
View File

@@ -114,7 +114,7 @@ private:
Error _create_context(GLDisplay &gl_display); Error _create_context(GLDisplay &gl_display);
public: public:
XVisualInfo get_vi(Display *p_display); XVisualInfo get_vi(Display *p_display, Error &r_error);
Error window_create(DisplayServer::WindowID p_window_id, ::Window p_window, Display *p_display, int p_width, int p_height); Error window_create(DisplayServer::WindowID p_window_id, ::Window p_window, Display *p_display, int p_width, int p_height);
void window_destroy(DisplayServer::WindowID p_window_id); void window_destroy(DisplayServer::WindowID p_window_id);
void window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height); void window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height);