ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SDL2] Remove delayed loading code.

This commit is contained in:
Joel Linn 2020-03-31 00:34:35 +02:00 committed by Rick Gibbed
parent 804384c19c
commit 11d79c6c1c
2 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/xenia/apu/sdl/sdl_audio_driver.cc
View File

@ -31,24 +31,14 @@ SDLAudioDriver::~SDLAudioDriver() {
};
bool SDLAudioDriver::Initialize() {
// With msvc delayed loading, exceptions are used to determine dll presence.
#if XE_PLATFORM_WIN32
__try {
#endif // XE_PLATFORM_WIN32
SDL_version ver = {};
SDL_GetVersion(&ver);
if ((ver.major < 2) ||
(ver.major == 2 && ver.minor == 0 && ver.patch < 8)) {
XELOGW(
"SDL library version {}.{}.{} is outdated. "
"You may experience choppy audio.",
ver.major, ver.minor, ver.patch);
}
#if XE_PLATFORM_WIN32
} __except (EXCEPTION_EXECUTE_HANDLER) {
return false;
SDL_version ver = {};
SDL_GetVersion(&ver);
if ((ver.major < 2) || (ver.major == 2 && ver.minor == 0 && ver.patch < 8)) {
XELOGW(
"SDL library version {}.{}.{} is outdated. "
"You may experience choppy audio.",
ver.major, ver.minor, ver.patch);
}
#endif // XE_PLATFORM_WIN32
if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) {
return false;

17
src/xenia/hid/sdl/sdl_input_driver.cc
View File

@ -398,21 +398,12 @@ bool SDLInputDriver::TestSDLVersion() {
const Uint8 min_patchlevel = 4;
#endif
// With msvc delayed loading, exceptions are used to determine dll presence.
#if XE_PLATFORM_WIN32
__try {
#endif // XE_PLATFORM_WIN32
SDL_version ver = {};
SDL_GetVersion(&ver);
if ((ver.major < 2) ||
(ver.major == 2 && ver.minor == 0 && ver.patch < min_patchlevel)) {
return false;
}
#if XE_PLATFORM_WIN32
} __except (EXCEPTION_EXECUTE_HANDLER) {
SDL_version ver = {};
SDL_GetVersion(&ver);
if ((ver.major < 2) ||
(ver.major == 2 && ver.minor == 0 && ver.patch < min_patchlevel)) {
return false;
}
#endif // XE_PLATFORM_WIN32
return true;
}