From 93daf232233dd0a68c6b0404d53b18e0d089b0d1 Mon Sep 17 00:00:00 2001 From: ocornut Date: Wed, 15 May 2024 14:18:48 +0200 Subject: [PATCH] Examples: SDL3: updates for latest SDL3 API changes. --- backends/imgui_impl_sdl3.cpp | 8 ++++++++ docs/CHANGELOG.txt | 2 +- examples/example_sdl3_sdlrenderer3/main.cpp | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/backends/imgui_impl_sdl3.cpp b/backends/imgui_impl_sdl3.cpp index 5143f9dc1..083876611 100644 --- a/backends/imgui_impl_sdl3.cpp +++ b/backends/imgui_impl_sdl3.cpp @@ -60,6 +60,14 @@ #define SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE 0 #endif +// FIXME-LEGACY: remove when SDL 3.1.3 preview is released. +#ifndef SDLK_APOSTROPHE +#define SDLK_APOSTROPHE SDLK_QUOTE +#endif +#ifndef SDLK_GRAVE +#define SDLK_GRAVE SDLK_BACKQUOTE +#endif + // SDL Data struct ImGui_ImplSDL3_Data { diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 62f231b0b..fcc48f410 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -56,7 +56,7 @@ Other changes: - Backends: Win32: undo an assert introduced in 1.90.6 which didn't allow WndProc handler to be called before backend initialization. Because of how ::CreateWindow() calls in WndProc this is facilitating. (#6275) [@MennoVink] -- Backends: SDL3: minor updates for latest SDL3 API changes. (#7580) [@kuvaus] +- Backends, Examples: SDL3: updates for latest SDL3 API changes. (#7580) [@kuvaus, @ocornut] ----------------------------------------------------------------------- diff --git a/examples/example_sdl3_sdlrenderer3/main.cpp b/examples/example_sdl3_sdlrenderer3/main.cpp index 802d68cd5..baa7cd76e 100644 --- a/examples/example_sdl3_sdlrenderer3/main.cpp +++ b/examples/example_sdl3_sdlrenderer3/main.cpp @@ -42,7 +42,8 @@ int main(int, char**) printf("Error: SDL_CreateWindow(): %s\n", SDL_GetError()); return -1; } - SDL_Renderer* renderer = SDL_CreateRenderer(window, nullptr, SDL_RENDERER_PRESENTVSYNC); + SDL_Renderer* renderer = SDL_CreateRenderer(window, nullptr); + SDL_SetRenderVSync(renderer, 1); if (renderer == nullptr) { SDL_Log("Error: SDL_CreateRenderer(): %s\n", SDL_GetError());