diff --git a/Common/GPU/Vulkan/VulkanContext.cpp b/Common/GPU/Vulkan/VulkanContext.cpp index 1ab7134c4f..864cf74cc7 100644 --- a/Common/GPU/Vulkan/VulkanContext.cpp +++ b/Common/GPU/Vulkan/VulkanContext.cpp @@ -932,7 +932,6 @@ bool VulkanContext::CreateInstanceAndDevice(const CreateInfo &info) { DestroyInstance(); return false; } - return true; } @@ -1550,7 +1549,7 @@ bool VulkanContext::InitSwapchain(VkPresentModeKHR desiredPresentMode) { res = vkCreateSwapchainKHR(device_, &swap_chain_info, NULL, &swapchain_); if (res != VK_SUCCESS) { - ERROR_LOG(Log::G3D, "vkCreateSwapchainKHR failed!"); + ERROR_LOG(Log::G3D, "vkCreateSwapchainKHR failed! %s", VulkanResultToString(res)); return false; } INFO_LOG(Log::G3D, "Created swapchain: %dx%d %s", swap_chain_info.imageExtent.width, swap_chain_info.imageExtent.height, (surfCapabilities_.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) ? "(TRANSFER_SRC_BIT supported)" : ""); diff --git a/Common/Render/AtlasGen.cpp b/Common/Render/AtlasGen.cpp index 241a4abd89..9ebae1f570 100644 --- a/Common/Render/AtlasGen.cpp +++ b/Common/Render/AtlasGen.cpp @@ -175,7 +175,7 @@ void Bucket::Pack2(int image_width) { // These are just temporary storage (the API is allocation-free otherwise). // About one node is needed for each horizontal unit of width. std::vector nodes(image_width * 2); - stbrp_init_target(&context, image_width, image_width * 2, nodes.data(), nodes.size()); + stbrp_init_target(&context, image_width, image_width * 2, nodes.data(), (int)nodes.size()); // Transfer the rectangles to the rect_pack structs from Data. std::vector rects(data.size()); for (int i = 0; i < data.size(); i++) { @@ -184,7 +184,7 @@ void Bucket::Pack2(int image_width) { rects[i].id = i; } { - stbrp_pack_rects(&context, rects.data(), rects.size()); + stbrp_pack_rects(&context, rects.data(), (int)rects.size()); } for (int i = 0; i < (int)data.size(); i++) { int index = rects[i].id; diff --git a/Core/System.cpp b/Core/System.cpp index 951d6a7615..217dc58cda 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -753,19 +753,6 @@ void PSP_Shutdown(bool success) { IncrementDebugCounter(DebugCounter::GAME_SHUTDOWN); } -// Do not use. Currently only used from the websocket debugger -BootState PSP_Reboot(std::string *error_string) { - if (g_bootState != BootState::Complete) { - return g_bootState; - } - - Core_Stop(); - Core_WaitInactive(); - PSP_Shutdown(true); - std::string resetError; - return PSP_Init(PSP_CoreParameter(), error_string); -} - void PSP_RunLoopWhileState() { // We just run the CPU until we get to vblank. This will quickly sync up pretty nicely. // The actual number of cycles doesn't matter so much here as we will break due to CORE_NEXTFRAME, most of the time hopefully... diff --git a/Core/System.h b/Core/System.h index f34284617e..9b66e6f12e 100644 --- a/Core/System.h +++ b/Core/System.h @@ -76,7 +76,6 @@ BootState PSP_InitUpdate(std::string *error_string); BootState PSP_Init(const CoreParameter &coreParam, std::string *error_string); void PSP_Shutdown(bool success); -BootState PSP_Reboot(std::string *error_string); FileLoader *PSP_LoadedFile();