SDL3 reverted their recent changes to SDL_GetTextureScaleMode and SDL…

…_GetRenderDrawBlendMode
texus · Jul 17, 2024 · 3a2837f · 3a2837f
1 parent 9bc9b5e
commit 3a2837f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/Backend/Renderer/SDL_Renderer/BackendRenderTargetSDL.cpp b/src/Backend/Renderer/SDL_Renderer/BackendRenderTargetSDL.cpp
@@ -78,12 +78,8 @@ namespace tgui
             return;
 
         // Store the current blend mode, in case we need to change it
-#if SDL_MAJOR_VERSION >= 3
-        SDL_BlendMode oldBlendMode = SDL_GetRenderDrawBlendMode(m_renderer);
-#else
         SDL_BlendMode oldBlendMode = SDL_BLENDMODE_BLEND;
         SDL_GetRenderDrawBlendMode(m_renderer, &oldBlendMode);
-#endif
 
         // Store the current clipping settings, in case we need to change it
         SDL_Rect oldClipRect;

diff --git a/src/Backend/Renderer/SDL_Renderer/BackendTextureSDL.cpp b/src/Backend/Renderer/SDL_Renderer/BackendTextureSDL.cpp
@@ -172,7 +172,9 @@ namespace tgui
         if (SDL_GetTextureSize(texture, &width, &height) == 0)
             m_imageSize = {static_cast<unsigned int>(width), static_cast<unsigned int>(height)};
 
-        m_isSmooth = (SDL_GetTextureScaleMode(m_texture) != SDL_SCALEMODE_NEAREST);
+        SDL_ScaleMode scaleMode;
+        if (SDL_GetTextureScaleMode(m_texture, &scaleMode) == 0)
+            m_isSmooth = (scaleMode != SDL_SCALEMODE_NEAREST);
 #elif ((SDL_MAJOR_VERSION == 2) && (SDL_MINOR_VERSION > 0)) \
    || ((SDL_MAJOR_VERSION == 2) && (SDL_MINOR_VERSION == 0) && (SDL_PATCHLEVEL >= 12))
         int width;