From ba6f5853e9382a959af8ff81980c0f06a6ffe80e Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Thu, 2 Jan 2025 13:50:37 +0100 Subject: Cherry-pick wayland improvements from upstream bgfx (#13070) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Properly support Wayland under EGL and Vulkan. (#3358) * Dynamically load libwayland-egl.so.1 when dealing with Wayland to remove dependencies at program startup. (#3359) * Cleanup. * Support both X11 and Wayland in the same build. (#3360) * Support both X11 and Wayland in the same build. - Works for both Vulkan and OpenGL. - Remove --with-wayland from genie options. - Vulkan loads all three extensions for surface creation instead of only one. - Add width and height parameter to GlContext::createSwapChain(), which is needed for EGL to create a SwapChain with the given window size. - Dirty-fix the example-22-windows to recreate the FrameBuffer by first destroying and then recreating to make sure the window is released of its swapchain. - Fix dbgText glitch in example-22-windows. - Remove old X11-related dependencies for GLFW3. * Formatting. * Adapt to latest bgfx wayland code * Cleanup. * Fix Vulkan swapchain invalidation issue. (#3379) * Fix Vulkan swapchain invalidation issue. * Always clamp render pass to frame buffer size. * Fix formatting. * Hopefully fix macOS build * Hopefully fix macOS build, attempt 2 --------- Co-authored-by: Martijn Courteaux Co-authored-by: Бранимир Караџић --- scripts/src/osd/sdl.lua | 15 --------------- scripts/src/osd/sdl_cfg.lua | 11 ----------- 2 files changed, 26 deletions(-) (limited to 'scripts') diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index cc31fa52008..3115c4d644f 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -37,12 +37,6 @@ function maintargetosdoptions(_target,_subtarget) end end - if _OPTIONS["USE_WAYLAND"]=="1" then - links { - "wayland-egl" - } - end - if _OPTIONS["NO_USE_XINPUT"]~="1" then links { "Xext", @@ -147,15 +141,6 @@ if not _OPTIONS["NO_X11"] then end end -newoption { - trigger = "USE_WAYLAND", - description = "Use Wayland", - allowed = { - { "0", "Do not use Wayland (use XWayland or X11)" }, - { "1", "Use Wayland" }, - }, -} - newoption { trigger = "NO_USE_XINPUT", description = "Disable use of Xinput", diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index 10dde2d511e..f3a970c4ad4 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -50,17 +50,6 @@ else } end -if _OPTIONS["USE_WAYLAND"]=="1" then - defines { - "SDLMAME_USE_WAYLAND", - } - if _OPTIONS["targetos"]=="linux" then - buildoptions { - backtick(pkgconfigcmd() .. " --cflags wayland-egl"), - } - end -end - if _OPTIONS["NO_USE_XINPUT"]=="1" then defines { "USE_XINPUT=0", -- cgit v1.2.3-70-g09d2