diff options
| -rw-r--r-- | src/core/settings.h | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_system.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index b5aeff29b..a8954647f 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -114,8 +114,8 @@ struct Values { // System bool use_docked_mode; bool enable_nfc; - int current_user; - int language_index; + s32 current_user; + s32 language_index; // Controls std::array<std::string, NativeButton::NumButtons> buttons; diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index f969d5196..54cc47a9b 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -928,8 +928,8 @@ void RasterizerOpenGL::SyncViewport(OpenGLState& current_state) { auto& viewport = current_state.viewports[i]; viewport.x = viewport_rect.left; viewport.y = viewport_rect.bottom; - viewport.width = static_cast<GLsizei>(viewport_rect.GetWidth()); - viewport.height = static_cast<GLsizei>(viewport_rect.GetHeight()); + viewport.width = static_cast<GLfloat>(viewport_rect.GetWidth()); + viewport.height = static_cast<GLfloat>(viewport_rect.GetHeight()); viewport.depth_range_far = regs.viewport[i].depth_range_far; viewport.depth_range_near = regs.viewport[i].depth_range_near; } diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index b4b4a4a56..4803d43bb 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -240,7 +240,7 @@ void ConfigureSystem::RefreshConsoleID() { void ConfigureSystem::SelectUser(const QModelIndex& index) { Settings::values.current_user = - std::clamp<std::size_t>(index.row(), 0, profile_manager->GetUserCount() - 1); + std::clamp<s32>(index.row(), 0, static_cast<s32>(profile_manager->GetUserCount() - 1)); UpdateCurrentUser(); |