cpp/openttd-patchpack/source Changeset - r24744:6381326705ae

Changeset - r24744:6381326705ae

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Patric Stout - 4 years ago 2021-02-11 10:19:05
truebrain@openttd.org

Codechange: [SDL2] Don't use globals if we can do with locals

1 file changed with 4 insertions and 6 deletions:

src/video/sdl2_v.cpp

0 comments (0 inline, 0 general)

src/video/sdl2_v.cpp

➞

Show inline comments

@@ @@ -37,52 +37,48 @@ static SDL_Window *_sdl_window; @@
 static SDL_Surface *_sdl_surface;
 static SDL_Surface *_sdl_rgb_surface;
 static SDL_Surface *_sdl_real_surface;
 /** Whether the drawing is/may be done in a separate thread. */
 static bool _draw_threaded;
 /** Mutex to keep the access to the shared memory controlled. */
 static std::recursive_mutex *_draw_mutex = nullptr;
 /** Signal to draw the next frame. */
 static std::condition_variable_any *_draw_signal = nullptr;
 /** Should we keep continue drawing? */
 static volatile bool _draw_continue;
 static Palette _local_palette;
 static SDL_Palette *_sdl_palette;
 #ifdef __EMSCRIPTEN__
 /** Whether we just had a window-enter event. */
 static bool _cursor_new_in_window = false;
 #endif
 #define MAX_DIRTY_RECTS 100
 static SDL_Rect _dirty_rects[MAX_DIRTY_RECTS];
 static int _num_dirty_rects;
 /* Size of window */
 static int _window_size_w;
 static int _window_size_h;
 void VideoDriver_SDL::MakeDirty(int left, int top, int width, int height)
+{
 	if (_num_dirty_rects < MAX_DIRTY_RECTS) {
 		_dirty_rects[_num_dirty_rects].x = left;
 		_dirty_rects[_num_dirty_rects].y = top;
 		_dirty_rects[_num_dirty_rects].w = width;
 		_dirty_rects[_num_dirty_rects].h = height;
+	}
 	_num_dirty_rects++;
+}
 static void UpdatePalette()
+{
 	SDL_Color pal[256];
 	for (int i = 0; i != _local_palette.count_dirty; i++) {
 		pal[i].r = _local_palette.palette[_local_palette.first_dirty + i].r;
 		pal[i].g = _local_palette.palette[_local_palette.first_dirty + i].g;
 		pal[i].b = _local_palette.palette[_local_palette.first_dirty + i].b;
 		pal[i].a = 0;
+	}
 	SDL_SetPaletteColors(_sdl_palette, pal, _local_palette.first_dirty, _local_palette.count_dirty);
 	SDL_SetSurfacePalette(_sdl_surface, _sdl_palette);
@@ @@ -908,67 +904,69 @@ void VideoDriver_SDL::MainLoopCleanup() @@
 #ifdef __EMSCRIPTEN__
 	emscripten_exit_pointerlock();
 	/* In effect, the game ends here. As emscripten_set_main_loop() caused
 	 * the stack to be unwound, the code after MainLoop() in
 	 * openttd_main() is never executed. */
 	EM_ASM(if (window["openttd_syncfs"]) openttd_syncfs());
 	EM_ASM(if (window["openttd_exit"]) openttd_exit());
 #endif
+}
 bool VideoDriver_SDL::ChangeResolution(int w, int h)
+{
 	std::unique_lock<std::recursive_mutex> lock;
 	if (_draw_mutex != nullptr) lock = std::unique_lock<std::recursive_mutex>(*_draw_mutex);
 	return CreateMainSurface(w, h, true);
+}
 bool VideoDriver_SDL::ToggleFullscreen(bool fullscreen)
+{
 	std::unique_lock<std::recursive_mutex> lock;
 	if (_draw_mutex != nullptr) lock = std::unique_lock<std::recursive_mutex>(*_draw_mutex);
 	int w, h;
 	/* Remember current window size */
 	if (fullscreen) {
-		SDL_GetWindowSize(_sdl_window, &_window_size_w, &_window_size_h);
+		SDL_GetWindowSize(_sdl_window, &w, &h);
 		/* Find fullscreen window size */
 		SDL_DisplayMode dm;
 		if (SDL_GetCurrentDisplayMode(0, &dm) < 0) {
 			DEBUG(driver, 0, "SDL_GetCurrentDisplayMode() failed: %s", SDL_GetError());
 		} else {
 			SDL_SetWindowSize(_sdl_window, dm.w, dm.h);
+		}
+	}
 	DEBUG(driver, 1, "SDL2: Setting %s", fullscreen ? "fullscreen" : "windowed");
 	int ret = SDL_SetWindowFullscreen(_sdl_window, fullscreen ? SDL_WINDOW_FULLSCREEN : 0);
 	if (ret == 0) {
 		/* Switching resolution succeeded, set fullscreen value of window. */
 		_fullscreen = fullscreen;
-		if (!fullscreen) SDL_SetWindowSize(_sdl_window, _window_size_w, _window_size_h);
+		if (!fullscreen) SDL_SetWindowSize(_sdl_window, w, h);
 	} else {
 		DEBUG(driver, 0, "SDL_SetWindowFullscreen() failed: %s", SDL_GetError());
+	}
 	return ret == 0;
+}
 bool VideoDriver_SDL::AfterBlitterChange()
+{
 	assert(BlitterFactory::GetCurrentBlitter()->GetScreenDepth() != 0);
 	int w, h;
 	SDL_GetWindowSize(_sdl_window, &w, &h);
 	return CreateMainSurface(w, h, false);
+}
 void VideoDriver_SDL::AcquireBlitterLock()
+{
 	if (_draw_mutex != nullptr) _draw_mutex->lock();
+}
 void VideoDriver_SDL::ReleaseBlitterLock()
+{
 	if (_draw_mutex != nullptr) _draw_mutex->unlock();
+}

0 comments (0 inline, 0 general)