diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/input_common/drivers/sdl_driver.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/texture_cache/format_lookup_table.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index 90128b6cf..1052ed394 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp | |||
| @@ -388,8 +388,6 @@ void SDLDriver::CloseJoysticks() { | |||
| 388 | } | 388 | } |
| 389 | 389 | ||
| 390 | SDLDriver::SDLDriver(const std::string& input_engine_) : InputEngine(input_engine_) { | 390 | SDLDriver::SDLDriver(const std::string& input_engine_) : InputEngine(input_engine_) { |
| 391 | Common::SetCurrentThreadName("yuzu:input:SDL"); | ||
| 392 | |||
| 393 | if (!Settings::values.enable_raw_input) { | 391 | if (!Settings::values.enable_raw_input) { |
| 394 | // Disable raw input. When enabled this setting causes SDL to die when a web applet opens | 392 | // Disable raw input. When enabled this setting causes SDL to die when a web applet opens |
| 395 | SDL_SetHint(SDL_HINT_JOYSTICK_RAWINPUT, "0"); | 393 | SDL_SetHint(SDL_HINT_JOYSTICK_RAWINPUT, "0"); |
| @@ -422,6 +420,7 @@ SDLDriver::SDLDriver(const std::string& input_engine_) : InputEngine(input_engin | |||
| 422 | initialized = true; | 420 | initialized = true; |
| 423 | if (start_thread) { | 421 | if (start_thread) { |
| 424 | poll_thread = std::thread([this] { | 422 | poll_thread = std::thread([this] { |
| 423 | Common::SetCurrentThreadName("yuzu:input:SDL"); | ||
| 425 | using namespace std::chrono_literals; | 424 | using namespace std::chrono_literals; |
| 426 | while (initialized) { | 425 | while (initialized) { |
| 427 | SDL_PumpEvents(); | 426 | SDL_PumpEvents(); |
diff --git a/src/video_core/texture_cache/format_lookup_table.cpp b/src/video_core/texture_cache/format_lookup_table.cpp index ddfb726fe..afa807d5d 100644 --- a/src/video_core/texture_cache/format_lookup_table.cpp +++ b/src/video_core/texture_cache/format_lookup_table.cpp | |||
| @@ -139,6 +139,8 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red, | |||
| 139 | return PixelFormat::D16_UNORM; | 139 | return PixelFormat::D16_UNORM; |
| 140 | case Hash(TextureFormat::S8D24, UINT, UNORM, UNORM, UNORM, LINEAR): | 140 | case Hash(TextureFormat::S8D24, UINT, UNORM, UNORM, UNORM, LINEAR): |
| 141 | return PixelFormat::S8_UINT_D24_UNORM; | 141 | return PixelFormat::S8_UINT_D24_UNORM; |
| 142 | case Hash(TextureFormat::S8D24, UINT, UNORM, UINT, UINT, LINEAR): | ||
| 143 | return PixelFormat::S8_UINT_D24_UNORM; | ||
| 142 | case Hash(TextureFormat::R8G24, UINT, UNORM, UNORM, UNORM, LINEAR): | 144 | case Hash(TextureFormat::R8G24, UINT, UNORM, UNORM, UNORM, LINEAR): |
| 143 | return PixelFormat::S8_UINT_D24_UNORM; | 145 | return PixelFormat::S8_UINT_D24_UNORM; |
| 144 | case Hash(TextureFormat::D32S8, FLOAT, UINT, UNORM, UNORM, LINEAR): | 146 | case Hash(TextureFormat::D32S8, FLOAT, UINT, UNORM, UNORM, LINEAR): |