Skip to content

Commit

Permalink
Cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bkaradzic @belegdol
bkaradzic authored and belegdol committed Dec 11, 2024
1 parent 3c5add6 commit 25a4174
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 37 deletions.
71 changes: 39 additions & 32 deletions 3rdparty/bgfx/src/glcontext_egl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,34 +113,38 @@ EGL_IMPORT


#if BX_PLATFORM_LINUX
#define WL_EGL_IMPORT \
WL_EGL_FUNC(struct wl_egl_window *, wl_egl_window_create, (struct wl_surface *, int, int)) \
WL_EGL_FUNC(void, wl_egl_window_destroy, (struct wl_egl_window *)) \
WL_EGL_FUNC(void, wl_egl_window_resize, (struct wl_egl_window *, int, int, int, int)) \
WL_EGL_FUNC(void, wl_egl_window_get_attached_size, (struct wl_egl_window *, int *, int *)) \

#define WL_EGL_FUNC(rt, fname, params) \
typedef rt(*PFNWLEGL_##fname) params; \
PFNWLEGL_##fname BGFX_WAYLAND_##fname;
# define WL_EGL_IMPORT \
WL_EGL_FUNC(struct wl_egl_window *, wl_egl_window_create, (struct wl_surface *, int, int) ) \
WL_EGL_FUNC(void, wl_egl_window_destroy, (struct wl_egl_window *)) \
WL_EGL_FUNC(void, wl_egl_window_resize, (struct wl_egl_window *, int, int, int, int)) \
WL_EGL_FUNC(void, wl_egl_window_get_attached_size, (struct wl_egl_window *, int *, int *) ) \

# define WL_EGL_FUNC(rt, fname, params) \
typedef rt(*PFNWLEGL_##fname) params; \
PFNWLEGL_##fname BGFX_WAYLAND_##fname;

WL_EGL_IMPORT
#undef WL_EGL_FUNC
# undef WL_EGL_FUNC

void *waylandEglOpen() {
void *so = bx::dlopen("libwayland-egl.so.1");
BGFX_FATAL(so != NULL, Fatal::UnableToInitialize, "Could not dlopen() libwayland-egl.so.1");
void* waylandEglOpen()
{
void* handle = bx::dlopen("libwayland-egl.so.1");
BGFX_FATAL(handle != NULL, Fatal::UnableToInitialize, "Could not dlopen() libwayland-egl.so.1");

#define WL_EGL_FUNC(rt, fname, params) BGFX_WAYLAND_##fname = (PFNWLEGL_##fname) bx::dlsym(so, #fname);
# define WL_EGL_FUNC(rt, fname, params) BGFX_WAYLAND_##fname = (PFNWLEGL_##fname) bx::dlsym(handle, #fname);
WL_EGL_IMPORT
#undef WL_EGL_FUNC
# undef WL_EGL_FUNC

return so;
return handle;
}

void waylandEglClose(void *so) {
bx::dlclose(so);
#define WL_EGL_FUNC(rt, fname, params) BGFX_WAYLAND_##fname = NULL;
void waylandEglClose(void* _handle)
{
bx::dlclose(_handle);

# define WL_EGL_FUNC(rt, fname, params) BGFX_WAYLAND_##fname = NULL;
WL_EGL_IMPORT
#undef WL_EGL_FUNC
# undef WL_EGL_FUNC
}
#endif // BX_PLATFORM_LINUX

Expand Down Expand Up @@ -244,7 +248,7 @@ WL_EGL_IMPORT
bcm_host_init();
# endif // BX_PLATFORM_RPI

m_eglLibrary = eglOpen();
m_eglDll = eglOpen();

if (NULL == g_platformData.context)
{
Expand All @@ -263,7 +267,7 @@ WL_EGL_IMPORT
}
# endif // BX_PLATFORM_WINDOWS

m_display = eglGetDisplay(NULL == ndt ? EGL_DEFAULT_DISPLAY : ndt);
m_display = eglGetDisplay(NULL == ndt ? EGL_DEFAULT_DISPLAY : ndt);
BGFX_FATAL(m_display != EGL_NO_DISPLAY, Fatal::UnableToInitialize, "Failed to create display %p", m_display);

EGLint major = 0;
Expand Down Expand Up @@ -373,8 +377,9 @@ WL_EGL_IMPORT
# endif // BX_PLATFORM_ANDROID

# if BX_PLATFORM_LINUX
if (g_platformData.type == NativeWindowHandleType::Wayland) {
m_waylandEglLibrary = waylandEglOpen();
if (g_platformData.type == NativeWindowHandleType::Wayland)
{
m_waylandEglDll = waylandEglOpen();
}
# endif
if (headless)
Expand Down Expand Up @@ -489,18 +494,19 @@ WL_EGL_IMPORT
eglDestroyContext(m_display, m_context);
eglDestroySurface(m_display, m_surface);
# if BX_PLATFORM_LINUX
if (m_egl_window) {
BGFX_WAYLAND_wl_egl_window_destroy(m_egl_window);
waylandEglClose(m_waylandEglLibrary);
m_waylandEglLibrary = NULL;
if (m_eglWindow)
{
BGFX_WAYLAND_wl_egl_window_destroy(m_eglWindow);
waylandEglClose(m_waylandEglDll);
m_waylandEglDll = NULL;
}
# endif
eglTerminate(m_display);
m_context = NULL;
}

eglClose(m_eglLibrary);
m_eglLibrary = NULL;
eglClose(m_eglDll);
m_eglDll = NULL;

# if BX_PLATFORM_RPI
bcm_host_deinit();
Expand All @@ -527,8 +533,9 @@ WL_EGL_IMPORT
# elif BX_PLATFORM_EMSCRIPTEN
EMSCRIPTEN_CHECK(emscripten_set_canvas_element_size(HTML5_TARGET_CANVAS_SELECTOR, _width, _height) );
# elif BX_PLATFORM_LINUX
if (NULL != m_egl_window) {
BGFX_WAYLAND_wl_egl_window_resize(m_egl_window, _width, _height, 0, 0);
if (NULL != m_eglWindow)
{
BGFX_WAYLAND_wl_egl_window_resize(m_eglWindow, _width, _height, 0, 0);
}
# else
BX_UNUSED(_width, _height);
Expand Down
10 changes: 5 additions & 5 deletions 3rdparty/bgfx/src/glcontext_egl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ namespace bgfx { namespace gl
, m_display(NULL)
, m_surface(NULL)
#if BX_PLATFORM_LINUX
, m_waylandEglLibrary(NULL)
, m_egl_window(NULL)
, m_waylandEglDll(NULL)
, m_eglWindow(NULL)
#endif
, m_msaaContext(false)
{
Expand All @@ -63,15 +63,15 @@ namespace bgfx { namespace gl
return NULL != m_context;
}

void* m_eglLibrary;
void* m_eglDll;
SwapChainGL* m_current;
EGLConfig m_config;
EGLContext m_context;
EGLDisplay m_display;
EGLSurface m_surface;
#if BX_PLATFORM_LINUX
void *m_waylandEglLibrary;
struct wl_egl_window *m_egl_window;
void* m_waylandEglDll;
struct wl_egl_window *m_eglWindow;
#endif
// true when MSAA is handled by the context instead of using MSAA FBO
bool m_msaaContext;
Expand Down

0 comments on commit 25a4174

Please sign in to comment.