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 { | |||
| 114 | // System | 114 | // System |
| 115 | bool use_docked_mode; | 115 | bool use_docked_mode; |
| 116 | bool enable_nfc; | 116 | bool enable_nfc; |
| 117 | int current_user; | 117 | s32 current_user; |
| 118 | int language_index; | 118 | s32 language_index; |
| 119 | 119 | ||
| 120 | // Controls | 120 | // Controls |
| 121 | std::array<std::string, NativeButton::NumButtons> buttons; | 121 | 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) { | |||
| 928 | auto& viewport = current_state.viewports[i]; | 928 | auto& viewport = current_state.viewports[i]; |
| 929 | viewport.x = viewport_rect.left; | 929 | viewport.x = viewport_rect.left; |
| 930 | viewport.y = viewport_rect.bottom; | 930 | viewport.y = viewport_rect.bottom; |
| 931 | viewport.width = static_cast<GLsizei>(viewport_rect.GetWidth()); | 931 | viewport.width = static_cast<GLfloat>(viewport_rect.GetWidth()); |
| 932 | viewport.height = static_cast<GLsizei>(viewport_rect.GetHeight()); | 932 | viewport.height = static_cast<GLfloat>(viewport_rect.GetHeight()); |
| 933 | viewport.depth_range_far = regs.viewport[i].depth_range_far; | 933 | viewport.depth_range_far = regs.viewport[i].depth_range_far; |
| 934 | viewport.depth_range_near = regs.viewport[i].depth_range_near; | 934 | viewport.depth_range_near = regs.viewport[i].depth_range_near; |
| 935 | } | 935 | } |
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() { | |||
| 240 | 240 | ||
| 241 | void ConfigureSystem::SelectUser(const QModelIndex& index) { | 241 | void ConfigureSystem::SelectUser(const QModelIndex& index) { |
| 242 | Settings::values.current_user = | 242 | Settings::values.current_user = |
| 243 | std::clamp<std::size_t>(index.row(), 0, profile_manager->GetUserCount() - 1); | 243 | std::clamp<s32>(index.row(), 0, static_cast<s32>(profile_manager->GetUserCount() - 1)); |
| 244 | 244 | ||
| 245 | UpdateCurrentUser(); | 245 | UpdateCurrentUser(); |
| 246 | 246 | ||