From ff9b0dfe2f72652f9713f7bd2102d0ec33fee336 Mon Sep 17 00:00:00 2001 From: emufan4568 Date: Thu, 21 Jul 2022 10:14:42 +0300 Subject: [PATCH] global: Fix some warnings --- src/citra_qt/bootmanager.cpp | 7 ++++++- src/citra_qt/cheats.cpp | 5 +++-- src/citra_qt/configuration/config.cpp | 6 ++++-- src/citra_qt/configuration/configure_camera.cpp | 3 ++- src/common/alignment.h | 2 +- src/common/texture.cpp | 4 ++-- src/video_core/renderer_vulkan/vk_instance.h | 2 +- src/video_core/renderer_vulkan/vk_rasterizer.cpp | 2 +- 8 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index fd65478df..87f62a799 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -94,7 +94,12 @@ void EmuThread::run() { emit DebugModeLeft(); exec_step = false; - Core::System::GetInstance().SingleStep(); + const auto result = Core::System::GetInstance().SingleStep(); + if (result != Core::System::ResultStatus::Success) { + this->SetRunning(false); + emit ErrorThrown(result, Core::System::GetInstance().GetStatusDetails()); + } + emit DebugModeEntered(); yieldCurrentThread(); diff --git a/src/citra_qt/cheats.cpp b/src/citra_qt/cheats.cpp index 25379b72c..bdccce736 100644 --- a/src/citra_qt/cheats.cpp +++ b/src/citra_qt/cheats.cpp @@ -49,9 +49,10 @@ CheatDialog::~CheatDialog() = default; void CheatDialog::LoadCheats() { cheats = Core::System::GetInstance().CheatEngine().GetCheats(); - ui->tableCheats->setRowCount(cheats.size()); + int cheat_count = static_cast(cheats.size()); + ui->tableCheats->setRowCount(cheat_count); - for (size_t i = 0; i < cheats.size(); i++) { + for (int i = 0; i < cheat_count; i++) { QCheckBox* enabled = new QCheckBox(); enabled->setChecked(cheats[i]->IsEnabled()); enabled->setStyleSheet(QStringLiteral("margin-left:7px;")); diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index 28612bbd0..36f0502b1 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -944,14 +944,16 @@ void Config::SaveMultiplayerValues() { // Write ban list qt_config->beginWriteArray(QStringLiteral("username_ban_list")); for (std::size_t i = 0; i < UISettings::values.ban_list.first.size(); ++i) { - qt_config->setArrayIndex(i); + int index = static_cast(i); + qt_config->setArrayIndex(index); WriteSetting(QStringLiteral("username"), QString::fromStdString(UISettings::values.ban_list.first[i])); } qt_config->endArray(); qt_config->beginWriteArray(QStringLiteral("ip_ban_list")); for (std::size_t i = 0; i < UISettings::values.ban_list.second.size(); ++i) { - qt_config->setArrayIndex(i); + int index = static_cast(i); + qt_config->setArrayIndex(index); WriteSetting(QStringLiteral("ip"), QString::fromStdString(UISettings::values.ban_list.second[i])); } diff --git a/src/citra_qt/configuration/configure_camera.cpp b/src/citra_qt/configuration/configure_camera.cpp index a89dc3151..ff6f50ed2 100644 --- a/src/citra_qt/configuration/configure_camera.cpp +++ b/src/citra_qt/configuration/configure_camera.cpp @@ -256,7 +256,8 @@ void ConfigureCamera::SetConfiguration() { int index = GetSelectedCameraIndex(); for (std::size_t i = 0; i < Implementations.size(); i++) { if (Implementations[i] == camera_name[index]) { - ui->image_source->setCurrentIndex(i); + int current_index = static_cast(i); + ui->image_source->setCurrentIndex(current_index); } } if (camera_name[index] == "image") { diff --git a/src/common/alignment.h b/src/common/alignment.h index 64fafd2e8..730a5a34d 100644 --- a/src/common/alignment.h +++ b/src/common/alignment.h @@ -10,7 +10,7 @@ namespace Common { template [[nodiscard]] constexpr T AlignUp(T value, std::size_t size) { static_assert(std::is_unsigned_v, "T must be an unsigned value."); - auto mod{value % size}; + auto mod = static_cast(value % size); value -= mod; return static_cast(mod == T{0} ? value : value + size); } diff --git a/src/common/texture.cpp b/src/common/texture.cpp index 2ec939288..44aa9253f 100644 --- a/src/common/texture.cpp +++ b/src/common/texture.cpp @@ -12,8 +12,8 @@ void FlipRGBA8Texture(std::vector& tex, u64 width, u64 height) { ASSERT(tex.size() == width * height * 4); const u64 line_size = width * 4; for (u64 line = 0; line < height / 2; line++) { - const u32 offset_1 = line * line_size; - const u32 offset_2 = (height - line - 1) * line_size; + const u64 offset_1 = line * line_size; + const u64 offset_2 = (height - line - 1) * line_size; // Swap lines std::swap_ranges(tex.begin() + offset_1, tex.begin() + offset_1 + line_size, tex.begin() + offset_2); diff --git a/src/video_core/renderer_vulkan/vk_instance.h b/src/video_core/renderer_vulkan/vk_instance.h index c155de32b..d54394ac6 100644 --- a/src/video_core/renderer_vulkan/vk_instance.h +++ b/src/video_core/renderer_vulkan/vk_instance.h @@ -32,7 +32,7 @@ public: /// Feature support bool SupportsAnisotropicFiltering() const; - u32 UniformMinAlignment() const { return device_limits.minUniformBufferOffsetAlignment; } + u32 UniformMinAlignment() const { return static_cast(device_limits.minUniformBufferOffsetAlignment); } private: bool CreateDevice(vk::SurfaceKHR surface, bool validation_enabled); diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 18e75f7ef..910c98ee6 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -1633,7 +1633,7 @@ void RasterizerVulkan::UploadUniforms(bool accelerate_draw) { if (!sync_vs && !sync_fs) return; - std::size_t uniform_size = uniform_size_aligned_vs + uniform_size_aligned_fs; + u32 uniform_size = uniform_size_aligned_vs + uniform_size_aligned_fs; std::size_t used_bytes = 0; u8* uniforms = nullptr; u32 offset = 0; bool invalidate = false;