global: Fix some warnings

This commit is contained in:
emufan4568
2022-07-21 10:14:42 +03:00
parent d51c720392
commit ff9b0dfe2f
8 changed files with 20 additions and 11 deletions

View File

@ -94,7 +94,12 @@ void EmuThread::run() {
emit DebugModeLeft(); emit DebugModeLeft();
exec_step = false; 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(); emit DebugModeEntered();
yieldCurrentThread(); yieldCurrentThread();

View File

@ -49,9 +49,10 @@ CheatDialog::~CheatDialog() = default;
void CheatDialog::LoadCheats() { void CheatDialog::LoadCheats() {
cheats = Core::System::GetInstance().CheatEngine().GetCheats(); cheats = Core::System::GetInstance().CheatEngine().GetCheats();
ui->tableCheats->setRowCount(cheats.size()); int cheat_count = static_cast<int>(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(); QCheckBox* enabled = new QCheckBox();
enabled->setChecked(cheats[i]->IsEnabled()); enabled->setChecked(cheats[i]->IsEnabled());
enabled->setStyleSheet(QStringLiteral("margin-left:7px;")); enabled->setStyleSheet(QStringLiteral("margin-left:7px;"));

View File

@ -944,14 +944,16 @@ void Config::SaveMultiplayerValues() {
// Write ban list // Write ban list
qt_config->beginWriteArray(QStringLiteral("username_ban_list")); qt_config->beginWriteArray(QStringLiteral("username_ban_list"));
for (std::size_t i = 0; i < UISettings::values.ban_list.first.size(); ++i) { for (std::size_t i = 0; i < UISettings::values.ban_list.first.size(); ++i) {
qt_config->setArrayIndex(i); int index = static_cast<int>(i);
qt_config->setArrayIndex(index);
WriteSetting(QStringLiteral("username"), WriteSetting(QStringLiteral("username"),
QString::fromStdString(UISettings::values.ban_list.first[i])); QString::fromStdString(UISettings::values.ban_list.first[i]));
} }
qt_config->endArray(); qt_config->endArray();
qt_config->beginWriteArray(QStringLiteral("ip_ban_list")); qt_config->beginWriteArray(QStringLiteral("ip_ban_list"));
for (std::size_t i = 0; i < UISettings::values.ban_list.second.size(); ++i) { for (std::size_t i = 0; i < UISettings::values.ban_list.second.size(); ++i) {
qt_config->setArrayIndex(i); int index = static_cast<int>(i);
qt_config->setArrayIndex(index);
WriteSetting(QStringLiteral("ip"), WriteSetting(QStringLiteral("ip"),
QString::fromStdString(UISettings::values.ban_list.second[i])); QString::fromStdString(UISettings::values.ban_list.second[i]));
} }

View File

@ -256,7 +256,8 @@ void ConfigureCamera::SetConfiguration() {
int index = GetSelectedCameraIndex(); int index = GetSelectedCameraIndex();
for (std::size_t i = 0; i < Implementations.size(); i++) { for (std::size_t i = 0; i < Implementations.size(); i++) {
if (Implementations[i] == camera_name[index]) { if (Implementations[i] == camera_name[index]) {
ui->image_source->setCurrentIndex(i); int current_index = static_cast<int>(i);
ui->image_source->setCurrentIndex(current_index);
} }
} }
if (camera_name[index] == "image") { if (camera_name[index] == "image") {

View File

@ -10,7 +10,7 @@ namespace Common {
template <typename T> template <typename T>
[[nodiscard]] constexpr T AlignUp(T value, std::size_t size) { [[nodiscard]] constexpr T AlignUp(T value, std::size_t size) {
static_assert(std::is_unsigned_v<T>, "T must be an unsigned value."); static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
auto mod{value % size}; auto mod = static_cast<T>(value % size);
value -= mod; value -= mod;
return static_cast<T>(mod == T{0} ? value : value + size); return static_cast<T>(mod == T{0} ? value : value + size);
} }

View File

@ -12,8 +12,8 @@ void FlipRGBA8Texture(std::vector<u8>& tex, u64 width, u64 height) {
ASSERT(tex.size() == width * height * 4); ASSERT(tex.size() == width * height * 4);
const u64 line_size = width * 4; const u64 line_size = width * 4;
for (u64 line = 0; line < height / 2; line++) { for (u64 line = 0; line < height / 2; line++) {
const u32 offset_1 = line * line_size; const u64 offset_1 = line * line_size;
const u32 offset_2 = (height - line - 1) * line_size; const u64 offset_2 = (height - line - 1) * line_size;
// Swap lines // Swap lines
std::swap_ranges(tex.begin() + offset_1, tex.begin() + offset_1 + line_size, std::swap_ranges(tex.begin() + offset_1, tex.begin() + offset_1 + line_size,
tex.begin() + offset_2); tex.begin() + offset_2);

View File

@ -32,7 +32,7 @@ public:
/// Feature support /// Feature support
bool SupportsAnisotropicFiltering() const; bool SupportsAnisotropicFiltering() const;
u32 UniformMinAlignment() const { return device_limits.minUniformBufferOffsetAlignment; } u32 UniformMinAlignment() const { return static_cast<u32>(device_limits.minUniformBufferOffsetAlignment); }
private: private:
bool CreateDevice(vk::SurfaceKHR surface, bool validation_enabled); bool CreateDevice(vk::SurfaceKHR surface, bool validation_enabled);

View File

@ -1633,7 +1633,7 @@ void RasterizerVulkan::UploadUniforms(bool accelerate_draw) {
if (!sync_vs && !sync_fs) if (!sync_vs && !sync_fs)
return; 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; std::size_t used_bytes = 0;
u8* uniforms = nullptr; u32 offset = 0; bool invalidate = false; u8* uniforms = nullptr; u32 offset = 0; bool invalidate = false;