From facabcee2afa270ca4486928ef776a4b25aaaf54 Mon Sep 17 00:00:00 2001
From: Patryk Obara <dreamer.tan@gmail.com>
Date: Wed, 18 Mar 2020 00:49:24 +0100
Subject: [PATCH] Handle surface as the last option during update

SCREEN_SURFACE is no longer the default option, and it's usable only for
debugging purposes. Move it to the last position in switches, to make
texture and opengl a little bit faster.
---
 src/gui/sdlmain.cpp | 59 ++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
index d92df23a..5dc8d94e 100644
--- a/src/gui/sdlmain.cpp
+++ b/src/gui/sdlmain.cpp
@@ -1422,15 +1422,6 @@ bool GFX_StartUpdate(uint8_t * &pixels, int &pitch)
 		return false;
 
 	switch (sdl.desktop.type) {
-	case SCREEN_SURFACE:
-		pixels = static_cast<uint8_t *>(sdl.surface->pixels);
-		pixels += sdl.clip.y * sdl.surface->pitch;
-		pixels += sdl.clip.x * sdl.surface->format->BytesPerPixel;
-		static_assert(std::is_same<decltype(pitch), decltype((sdl.surface->pitch))>::value,
-		              "SDL internal surface pitch type should match our type.");
-		pitch = sdl.surface->pitch;
-		sdl.updating = true;
-		return true;
 	case SCREEN_TEXTURE:
 		assert(sdl.texture.input_surface);
 		pixels = static_cast<uint8_t *>(sdl.texture.input_surface->pixels);
@@ -1454,6 +1445,16 @@ bool GFX_StartUpdate(uint8_t * &pixels, int &pitch)
 		sdl.updating = true;
 		return true;
 #endif
+	case SCREEN_SURFACE:
+		assert(sdl.surface);
+		pixels = static_cast<uint8_t *>(sdl.surface->pixels);
+		pixels += sdl.clip.y * sdl.surface->pitch;
+		pixels += sdl.clip.x * sdl.surface->format->BytesPerPixel;
+		static_assert(std::is_same<decltype(pitch), decltype((sdl.surface->pitch))>::value,
+		              "SDL internal surface pitch type should match our type.");
+		pitch = sdl.surface->pitch;
+		sdl.updating = true;
+		return true;
 	}
 	return false;
 }
@@ -1466,26 +1467,6 @@ void GFX_EndUpdate( const Bit16u *changedLines ) {
 	bool actually_updating = sdl.updating;
 	sdl.updating=false;
 	switch (sdl.desktop.type) {
-	case SCREEN_SURFACE:
-		if (changedLines) {
-			Bitu y = 0, index = 0, rectCount = 0;
-			while (y < sdl.draw.height) {
-				if (!(index & 1)) {
-					y += changedLines[index];
-				} else {
-					SDL_Rect *rect = &sdl.updateRects[rectCount++];
-					rect->x = sdl.clip.x;
-					rect->y = sdl.clip.y + y;
-					rect->w = (Bit16u)sdl.draw.width;
-					rect->h = changedLines[index];
-					y += changedLines[index];
-				}
-				index++;
-			}
-			if (rectCount)
-				SDL_UpdateWindowSurfaceRects(sdl.window, sdl.updateRects, rectCount);
-		}
-		break;
 	case SCREEN_TEXTURE:
 		assert(sdl.texture.input_surface);
 		SDL_UpdateTexture(sdl.texture.texture,
@@ -1547,7 +1528,25 @@ void GFX_EndUpdate( const Bit16u *changedLines ) {
 		SDL_GL_SwapWindow(sdl.window);
 		break;
 #endif
-	default:
+	case SCREEN_SURFACE:
+		if (changedLines) {
+			Bitu y = 0, index = 0, rectCount = 0;
+			while (y < sdl.draw.height) {
+				if (!(index & 1)) {
+					y += changedLines[index];
+				} else {
+					SDL_Rect *rect = &sdl.updateRects[rectCount++];
+					rect->x = sdl.clip.x;
+					rect->y = sdl.clip.y + y;
+					rect->w = (Bit16u)sdl.draw.width;
+					rect->h = changedLines[index];
+					y += changedLines[index];
+				}
+				index++;
+			}
+			if (rectCount)
+				SDL_UpdateWindowSurfaceRects(sdl.window, sdl.updateRects, rectCount);
+		}
 		break;
 	}
 }