diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index a44d02167a..596fd185e3 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -831,7 +831,7 @@ void VulkanQueueRunner::LogRenderPass(const VKRStep &pass, bool verbose) { INFO_LOG(G3D, "RENDER %s Begin(%s, draws: %d, %dx%d, %s, %s, %s)", pass.tag, framebuf, r.numDraws, w, h, RenderPassActionName(r.color), RenderPassActionName(r.depth), RenderPassActionName(r.stencil)); // TODO: Log these in detail. - for (int i = 0; i < pass.preTransitions.size(); i++) { + for (int i = 0; i < (int)pass.preTransitions.size(); i++) { INFO_LOG(G3D, " PRETRANSITION: %s %s -> %s", pass.preTransitions[i].fb->tag.c_str(), AspectToString(pass.preTransitions[i].aspect), ImageLayoutToString(pass.preTransitions[i].targetLayout)); } diff --git a/Common/Thread/ThreadManager.cpp b/Common/Thread/ThreadManager.cpp index 43a658c2ac..5fca697635 100644 --- a/Common/Thread/ThreadManager.cpp +++ b/Common/Thread/ThreadManager.cpp @@ -221,7 +221,7 @@ void ThreadManager::EnqueueTask(Task *task) { } // Find a thread with no outstanding work. - _assert_(maxThread <= global_->threads_.size()); + _assert_(maxThread <= (int)global_->threads_.size()); for (int threadNum = minThread; threadNum < maxThread; threadNum++) { ThreadContext *thread = global_->threads_[threadNum]; if (thread->queue_size.load() == 0) { diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp index 589bbe748c..da24649553 100644 --- a/Core/CoreTiming.cpp +++ b/Core/CoreTiming.cpp @@ -192,7 +192,7 @@ void RestoreRegisterEvent(int &event_type, const char *name, TimedCallback callb event_type = -1; if (event_type == -1) event_type = nextEventTypeRestoreId++; - if (event_type >= event_types.size()) { + if (event_type >= (int)event_types.size()) { // Give it any unused event id starting from the end. // Older save states with messed up ids have gaps near the end. for (int i = (int)event_types.size() - 1; i >= 0; --i) { @@ -202,7 +202,7 @@ void RestoreRegisterEvent(int &event_type, const char *name, TimedCallback callb } } } - _assert_msg_(event_type >= 0 && event_type < event_types.size(), "Invalid event type %d", event_type); + _assert_msg_(event_type >= 0 && event_type < (int)event_types.size(), "Invalid event type %d", event_type); event_types[event_type] = EventType{ callback, name }; usedEventTypes.insert(event_type); restoredEventTypes.insert(event_type); diff --git a/Core/Dialog/PSPMsgDialog.cpp b/Core/Dialog/PSPMsgDialog.cpp index 324a40c5e7..b681319aab 100755 --- a/Core/Dialog/PSPMsgDialog.cpp +++ b/Core/Dialog/PSPMsgDialog.cpp @@ -186,7 +186,7 @@ void PSPMsgDialog::DisplayMessage(std::string text, bool hasYesNo, bool hasOK) { // Without the scrollbar, we have 390 total pixels. float WRAP_WIDTH = 340.0f; - if (UTF8StringNonASCIICount(text.c_str()) >= text.size() / 4) { + if ((size_t)UTF8StringNonASCIICount(text.c_str()) >= text.size() / 4) { WRAP_WIDTH = 376.0f; if (text.size() > 12) { messageStyle.scale = 0.6f; diff --git a/Core/KeyMap.cpp b/Core/KeyMap.cpp index acd8eb91b7..eb60024a8a 100644 --- a/Core/KeyMap.cpp +++ b/Core/KeyMap.cpp @@ -599,7 +599,7 @@ bool IsKeyMapped(int device, int key) { bool ReplaceSingleKeyMapping(int btn, int index, KeyDef key) { // Check for duplicate - for (int i = 0; i < g_controllerMap[btn].size(); ++i) { + for (int i = 0; i < (int)g_controllerMap[btn].size(); ++i) { if (i != index && g_controllerMap[btn][i] == key) { g_controllerMap[btn].erase(g_controllerMap[btn].begin()+index); g_controllerMapGeneration++; diff --git a/GPU/Common/PresentationCommon.cpp b/GPU/Common/PresentationCommon.cpp index b08469837b..b34f8f4df8 100644 --- a/GPU/Common/PresentationCommon.cpp +++ b/GPU/Common/PresentationCommon.cpp @@ -228,7 +228,7 @@ bool PresentationCommon::UpdatePostShader() { bool usePreviousFrame = false; bool usePreviousAtOutputResolution = false; - for (int i = 0; i < shaderInfo.size(); ++i) { + for (size_t i = 0; i < shaderInfo.size(); ++i) { const ShaderInfo *next = i + 1 < shaderInfo.size() ? shaderInfo[i + 1] : nullptr; if (!BuildPostShader(shaderInfo[i], next)) { DestroyPostShader(); @@ -712,7 +712,7 @@ void PresentationCommon::CopyToOutput(OutputFlags flags, int uvRotation, float u // This is the last pass and we're going direct to the backbuffer after this. // Redirect output to a separate framebuffer to keep the previous frame. previousIndex_++; - if (previousIndex_ >= previousFramebuffers_.size()) + if (previousIndex_ >= (int)previousFramebuffers_.size()) previousIndex_ = 0; postShaderFramebuffer = previousFramebuffers_[previousIndex_]; } @@ -734,7 +734,7 @@ void PresentationCommon::CopyToOutput(OutputFlags flags, int uvRotation, float u // Pick the next to render to. previousIndex_++; - if (previousIndex_ >= previousFramebuffers_.size()) + if (previousIndex_ >= (int)previousFramebuffers_.size()) previousIndex_ = 0; Draw::Framebuffer *postShaderFramebuffer = previousFramebuffers_[previousIndex_];