summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/osd/sdl.lua
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2025-01-02 13:50:37 +0100
committer GitHub <noreply@github.com>2025-01-02 13:50:37 +0100
commitba6f5853e9382a959af8ff81980c0f06a6ffe80e (patch)
tree82f1b4963be587f0aa8766a03557c58996b4ca38 /scripts/src/osd/sdl.lua
parent6a403fc29993062aa451f5557cc88abc2fe7b2e7 (diff)
Cherry-pick wayland improvements from upstream bgfx (#13070)
* 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 <courteauxmartijn@gmail.com> Co-authored-by: Бранимир Караџић <branimirkaradzic@gmail.com>
Diffstat (limited to 'scripts/src/osd/sdl.lua')
-rw-r--r--scripts/src/osd/sdl.lua15
1 files changed, 0 insertions, 15 deletions
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",
@@ -148,15 +142,6 @@ if not _OPTIONS["NO_X11"] then
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",
allowed = {