Merge branch 'master' into jgrpp
# Conflicts: # .github/workflows/release-linux.yml # .github/workflows/release.yml # src/rail_cmd.cpp # src/rail_gui.cpp # src/script/api/script_rail.cpp # src/settings_gui.cpp # src/signal_type.h # src/video/sdl2_v.cpp
This commit is contained in:
		| @@ -839,11 +839,6 @@ static const char *InitializeSDL() | ||||
| 	FcitxInit(); | ||||
| #endif | ||||
|  | ||||
| 	/* Explicitly disable hardware acceleration. Enabling this causes | ||||
| 	 * UpdateWindowSurface() to update the window's texture instead of | ||||
| 	 * its surface. */ | ||||
| 	SDL_SetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION, "0"); | ||||
|  | ||||
| 	/* Check if the video-driver is already initialized. */ | ||||
| 	if (SDL_WasInit(SDL_INIT_VIDEO) != 0) return nullptr; | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Jonathan G Rennison
					Jonathan G Rennison