From 11f38db3f652069a23a8835882fdef094b7cd224 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Thu, 1 Sep 2022 00:23:45 -0400
Subject: [PATCH] video: SDL_Flip shouldn't return an error for SDL_OPENGL
surfaces.
The same error message will get set (matching 1.2) when it calls down
into SDL_UpdateRect(), but SDL_Flip still needs to return 0 in this case,
to match 1.2 behavior.
This should fix OpenXcom, which panics and terminates when it sees an
error here.
Fixes #185.
---
src/SDL12_compat.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c
index 250f8e9d..40cb62ea 100644
--- a/src/SDL12_compat.c
+++ b/src/SDL12_compat.c
@@ -6585,10 +6585,6 @@ SDL_UpdateRect(SDL12_Surface *screen12, Sint32 x, Sint32 y, Uint32 w, Uint32 h)
DECLSPEC int SDLCALL
SDL_Flip(SDL12_Surface *surface12)
{
- if (surface12->flags & SDL12_OPENGL) {
- return SDL20_SetError("Use SDL_GL_SwapBuffers() on OpenGL surfaces");
- }
-
if (surface12 == VideoSurface12) {
SDL_UpdateRect(surface12, 0, 0, 0, 0); /* update the whole screen and present now. */
}