diff --git a/Common/GPU/Vulkan/VulkanMemory.cpp b/Common/GPU/Vulkan/VulkanMemory.cpp index b4f1837729..eba7476190 100644 --- a/Common/GPU/Vulkan/VulkanMemory.cpp +++ b/Common/GPU/Vulkan/VulkanMemory.cpp @@ -71,7 +71,8 @@ VulkanPushPool::Block VulkanPushPool::CreateBlock(size_t size) { VmaAllocationInfo allocInfo{}; VkResult result = vmaCreateBuffer(vulkan_->Allocator(), &b, &allocCreateInfo, &block.buffer, &block.allocation, &allocInfo); - _assert_(result == VK_SUCCESS); + + _assert_msg_(result == VK_SUCCESS, "VulkanPushPool: Failed to create buffer (result = %s, size = %d)", VulkanResultToString(result), (int)size); result = vmaMapMemory(vulkan_->Allocator(), block.allocation, (void **)(&block.writePtr)); diff --git a/Common/UI/PopupScreens.h b/Common/UI/PopupScreens.h index 73d130eda8..f7f781b531 100644 --- a/Common/UI/PopupScreens.h +++ b/Common/UI/PopupScreens.h @@ -427,7 +427,6 @@ public: private: std::string *value_; - BrowseFileType fileType_; RequesterToken token_; }; diff --git a/GPU/Common/VertexDecoderCommon.cpp b/GPU/Common/VertexDecoderCommon.cpp index b7eb2ca315..9885aa0069 100644 --- a/GPU/Common/VertexDecoderCommon.cpp +++ b/GPU/Common/VertexDecoderCommon.cpp @@ -1313,9 +1313,7 @@ void VertexDecoder::SetVertexType(u32 fmt, const VertexDecoderOptions &options, // Can skip looking up in the JIT. jitted_ = &VtxDec_Tu8_C5551_Ps16; return; - } - // Fails to update alphaFull properly. - else if (!options.expand8BitNormalsToFloat && fmtWithoutSkinFlag == (GE_VTYPE_TC_16BIT | GE_VTYPE_NRM_8BIT | GE_VTYPE_COL_8888 | GE_VTYPE_POS_FLOAT)) { + } else if (!options.expand8BitNormalsToFloat && fmtWithoutSkinFlag == (GE_VTYPE_TC_16BIT | GE_VTYPE_NRM_8BIT | GE_VTYPE_COL_8888 | GE_VTYPE_POS_FLOAT)) { jitted_ = &VtxDec_Tu16_C8888_Pfloat; return; } diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp index 261bbe29b9..f6a4717f57 100644 --- a/UI/DisplayLayoutScreen.cpp +++ b/UI/DisplayLayoutScreen.cpp @@ -442,7 +442,7 @@ void DisplayLayoutScreen::CreateViews() { value = setting.value; if (duplicated) { - auto sliderName = StringFromFormat("%s %s", ps->T(setting.name), ps->T("(duplicated setting, previous slider will be used)")); + auto sliderName = StringFromFormat("%s %s", ps->T_cstr(setting.name.c_str()), ps->T_cstr("(duplicated setting, previous slider will be used)")); PopupSliderChoiceFloat *settingValue = settingContainer->Add(new PopupSliderChoiceFloat(&value, setting.minValue, setting.maxValue, setting.value, sliderName, setting.step, screenManager())); settingValue->SetEnabled(false); } else { diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index a693157d0a..4c035ca6b6 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -1209,7 +1209,7 @@ bool HandleGlobalMessage(UIMessage message, const std::string &value) { return true; } else if (message == UIMessage::SAVESTATE_DISPLAY_SLOT) { auto sy = GetI18NCategory(I18NCat::SYSTEM); - std::string msg = StringFromFormat("%s: %d", std::string(sy->T("Savestate Slot")).c_str(), SaveState::GetCurrentSlot() + 1); + std::string msg = StringFromFormat("%s: %d", sy->T_cstr("Savestate Slot"), SaveState::GetCurrentSlot() + 1); // Show for the same duration as the preview. g_OSD.Show(OSDType::MESSAGE_INFO, msg, 2.0f, "savestate_slot"); return true;