diff options
| author | JMC47 <JMC4789@gmail.com> | 2024-10-05 00:51:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-05 00:51:27 -0400 |
| commit | 2d9f789940aba806f75cd329905253c05577d837 (patch) | |
| tree | 89bc3e3f02c7cf315b14d682976efb8d29e10d8d /Source/Core/VideoBackends/Vulkan/ObjectCache.cpp | |
| parent | ae14abb2faab4b96c12a70f5a9c136476523b36a (diff) | |
| parent | dc6ccfb2abfc7c37deded1c5b9242ff1396e4fcf (diff) | |
Merge pull request #13050 from TellowKrinkle/HKIsNotMVK
Vulkan: Don't do MoltenVK things on Asahi Linux
Diffstat (limited to 'Source/Core/VideoBackends/Vulkan/ObjectCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/ObjectCache.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp index c32365f3fc..e32675fe57 100644 --- a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp +++ b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp @@ -627,24 +627,24 @@ bool ObjectCache::ValidatePipelineCache(const u8* data, size_t data_length) return false; } - if (header.vendor_id != g_vulkan_context->GetDeviceProperties().vendorID) + if (header.vendor_id != g_vulkan_context->GetDeviceInfo().vendorID) { ERROR_LOG_FMT( VIDEO, "Pipeline cache failed validation: Incorrect vendor ID (file: {:#X}, device: {:#X})", - header.vendor_id, g_vulkan_context->GetDeviceProperties().vendorID); + header.vendor_id, g_vulkan_context->GetDeviceInfo().vendorID); return false; } - if (header.device_id != g_vulkan_context->GetDeviceProperties().deviceID) + if (header.device_id != g_vulkan_context->GetDeviceInfo().deviceID) { ERROR_LOG_FMT( VIDEO, "Pipeline cache failed validation: Incorrect device ID (file: {:#X}, device: {:#X})", - header.device_id, g_vulkan_context->GetDeviceProperties().deviceID); + header.device_id, g_vulkan_context->GetDeviceInfo().deviceID); return false; } - if (std::memcmp(header.uuid, g_vulkan_context->GetDeviceProperties().pipelineCacheUUID, - VK_UUID_SIZE) != 0) + if (std::memcmp(header.uuid, g_vulkan_context->GetDeviceInfo().pipelineCacheUUID, VK_UUID_SIZE) != + 0) { ERROR_LOG_FMT(VIDEO, "Pipeline cache failed validation: Incorrect UUID"); return false; |
