preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add missing check to Vulkan init. Disable validation on android-x86-64

Browse Source 
The latter is broken in the Android SDK emulator.
This commit is contained in:
Henrik Rydgård
2026-02-27 15:56:47 +01:00
parent 641bfe43a7
commit 845f9f3d55
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/GPU/Vulkan/VulkanContext.cpp
+7 -5
View File
@@ -614,6 +614,7 @@ VkResult VulkanContext::CreateDevice(int physical_device) {
WARN_LOG(Log::G3D, "CheckLayers for device %d failed", physical_device);
}
queue_count = 0;
vkGetPhysicalDeviceQueueFamilyProperties(physical_devices_[physical_device_], &queue_count, nullptr);
_dbg_assert_(queue_count >= 1);
@@ -1250,13 +1251,14 @@ VkResult VulkanContext::ReinitSurface() {
// Query presentation modes. We need to know which ones are available for InitSwapchain().
availablePresentModes_.clear();
uint32_t presentModeCount;
uint32_t presentModeCount = 0;
VkResult res = vkGetPhysicalDeviceSurfacePresentModesKHR(physical_devices_[physical_device_], surface_, &presentModeCount, nullptr);
availablePresentModes_.resize(presentModeCount);
_dbg_assert_(res == VK_SUCCESS);
res = vkGetPhysicalDeviceSurfacePresentModesKHR(physical_devices_[physical_device_], surface_, &presentModeCount, availablePresentModes_.data());
_dbg_assert_(res == VK_SUCCESS);
if (res == VK_SUCCESS) {
availablePresentModes_.resize(presentModeCount);
res = vkGetPhysicalDeviceSurfacePresentModesKHR(physical_devices_[physical_device_], surface_, &presentModeCount, availablePresentModes_.data());
_dbg_assert_(res == VK_SUCCESS);
}
return VK_SUCCESS;
}
GPU/Vulkan/VulkanUtil.cpp
+4 -1
View File
@@ -24,7 +24,9 @@
#include "Core/FrameTiming.h"
#include "GPU/Vulkan/VulkanUtil.h"
#ifdef _DEBUG
// Disable this on x64 android, causes problems.
#if defined(_DEBUG) && !(PPSSPP_PLATFORM(ANDROID) && PPSSPP_ARCH(AMD64))
static const bool g_Validate = true;
#else
static const bool g_Validate = false;
@@ -54,6 +56,7 @@ VkPresentModeKHR ConfigPresentModeToVulkan(Draw::DrawContext *draw) {
// TODO: Share this between backends.
static VulkanInitFlags VulkanInitFlagsFromConfig() {
VulkanInitFlags flags = (VulkanInitFlags)0;
if (g_Validate) {
flags |= VulkanInitFlags::VALIDATE;
}
UI/ImDebugger/ImMemView.cpp
+1 -1
View File
@@ -1096,7 +1096,7 @@ void ImMemWindow::Draw(MIPSDebugInterface *mipsDebug, ImConfig &cfg, ImControl &
ImGui::SetKeyboardFocusHere(0);
focusSearchValueInput_ = false;
}
if (ImGui::InputText("data", searchStr_, IM_ARRAYSIZE(searchStr_), ImGuiInputTextFlags_EnterReturnsTrue) | ImGui::Button("Search")) {
if (ImGui::InputText("data", searchStr_, IM_ARRAYSIZE(searchStr_), ImGuiInputTextFlags_EnterReturnsTrue) || ImGui::Button("Search")) {
memView_.initSearch(searchStr_, selectedSearchType_);
// TODO: transfer focus on the memview.
}