jaildesigner-jailgames/jaildoctors_dilemma
1
0
Fork 2
Code Issues 1 Pull Requests Projects Releases 20 Wiki Activity

fix: vsync off no anava en Wayland

Browse Source
This commit is contained in:
Sergio
2026-03-29 14:13:02 +02:00
parent ad467847b9
commit d6ecadfd3a
3 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/core/rendering/screen.cpp
View File

@@ -297,11 +297,24 @@ void Screen::adjustWindowSize() {
int old_x, old_y; int old_x, old_y;
SDL_GetWindowPosition(window_, &old_x, &old_y); SDL_GetWindowPosition(window_, &old_x, &old_y);
const int NEW_X = old_x + ((old_w - (window_width_ * Options::window.zoom)) / 2); const int new_w = window_width_ * Options::window.zoom;
const int NEW_Y = old_y + ((old_h - (window_height_ * Options::window.zoom)) / 2); const int new_h = window_height_ * Options::window.zoom;
const int NEW_X = old_x + ((old_w - new_w) / 2);
const int NEW_Y = old_y + ((old_h - new_h) / 2);
SDL_SetWindowSize(window_, window_width_ * Options::window.zoom, window_height_ * Options::window.zoom); SDL_SetWindowSize(window_, new_w, new_h);
SDL_SetWindowPosition(window_, std::max(NEW_X, WINDOWS_DECORATIONS), std::max(NEW_Y, 0));
// En Wayland, SDL_SetWindowPosition es ignorado por el compositor (limitación de
// protocolo: el compositor controla la posición de ventanas toplevel). Solo se
// aplica en X11/Windows/macOS donde el posicionado funciona correctamente.
// SDL_SyncWindow garantiza que el resize esté completado antes de reposicionar
// (evita el race condition en X11).
SDL_SyncWindow(window_);
const char* driver = SDL_GetCurrentVideoDriver();
const bool is_wayland = (driver != nullptr && SDL_strcmp(driver, "wayland") == 0);
if (!is_wayland) {
SDL_SetWindowPosition(window_, std::max(NEW_X, WINDOWS_DECORATIONS), std::max(NEW_Y, 0));
}
} }
} }

21
source/core/rendering/sdl3gpu/sdl3gpu_shader.cpp
View File

@@ -433,7 +433,7 @@ namespace Rendering {
device_ = nullptr; device_ = nullptr;
return false; return false;
} }
SDL_SetGPUSwapchainParameters(device_, window_, SDL_GPU_SWAPCHAINCOMPOSITION_SDR, vsync_ ? SDL_GPU_PRESENTMODE_VSYNC : SDL_GPU_PRESENTMODE_IMMEDIATE); SDL_SetGPUSwapchainParameters(device_, window_, SDL_GPU_SWAPCHAINCOMPOSITION_SDR, bestPresentMode(vsync_));
} }
// ---------------------------------------------------------------- // ----------------------------------------------------------------
@@ -1144,10 +1144,27 @@ namespace Rendering {
active_shader_ = type; active_shader_ = type;
} }
auto SDL3GPUShader::bestPresentMode(bool vsync) const -> SDL_GPUPresentMode {
if (vsync) {
return SDL_GPU_PRESENTMODE_VSYNC;
}
// IMMEDIATE: sin sincronización — el driver puede no soportarlo en Wayland/compositing
if (SDL_WindowSupportsGPUPresentMode(device_, window_, SDL_GPU_PRESENTMODE_IMMEDIATE)) {
return SDL_GPU_PRESENTMODE_IMMEDIATE;
}
// MAILBOX: presenta en el siguiente VBlank pero sin bloquear el hilo (triple buffer)
if (SDL_WindowSupportsGPUPresentMode(device_, window_, SDL_GPU_PRESENTMODE_MAILBOX)) {
SDL_Log("SDL3GPUShader: IMMEDIATE no soportado, usando MAILBOX para VSync desactivado");
return SDL_GPU_PRESENTMODE_MAILBOX;
}
SDL_Log("SDL3GPUShader: IMMEDIATE y MAILBOX no soportados, forzando VSYNC");
return SDL_GPU_PRESENTMODE_VSYNC;
}
void SDL3GPUShader::setVSync(bool vsync) { void SDL3GPUShader::setVSync(bool vsync) {
vsync_ = vsync; vsync_ = vsync;
if (device_ != nullptr && window_ != nullptr) { if (device_ != nullptr && window_ != nullptr) {
SDL_SetGPUSwapchainParameters(device_, window_, SDL_GPU_SWAPCHAINCOMPOSITION_SDR, vsync_ ? SDL_GPU_PRESENTMODE_VSYNC : SDL_GPU_PRESENTMODE_IMMEDIATE); SDL_SetGPUSwapchainParameters(device_, window_, SDL_GPU_SWAPCHAINCOMPOSITION_SDR, bestPresentMode(vsync_));
} }
} }

2
source/core/rendering/sdl3gpu/sdl3gpu_shader.hpp
View File

@@ -141,6 +141,8 @@ namespace Rendering {
auto reinitTexturesAndBuffer() -> bool; // Recrea scene_texture_ y upload_buffer_ auto reinitTexturesAndBuffer() -> bool; // Recrea scene_texture_ y upload_buffer_
auto recreateScaledTexture(int factor) -> bool; // Recrea scaled_texture_ para factor dado auto recreateScaledTexture(int factor) -> bool; // Recrea scaled_texture_ para factor dado
static auto calcSsFactor(float zoom) -> int; // Primer múltiplo de 3 >= zoom (mín 3) static auto calcSsFactor(float zoom) -> int; // Primer múltiplo de 3 >= zoom (mín 3)
// Devuelve el mejor present mode disponible: IMMEDIATE > MAILBOX > VSYNC
[[nodiscard]] auto bestPresentMode(bool vsync) const -> SDL_GPUPresentMode;
SDL_Window* window_ = nullptr; SDL_Window* window_ = nullptr;
SDL_GPUDevice* device_ = nullptr; SDL_GPUDevice* device_ = nullptr;