From 6fd1c0e3d9c7c537d11d6466d1ec1d80ff6bd0e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Oct 2018 10:11:23 +0200 Subject: [PATCH] Instead of the last commit, don't enable the dual src extension at all on Adreno. This reverts commit eba6c00a8ab2631409301b03549496caab16e9be. --- Common/Vulkan/VulkanContext.cpp | 2 +- GPU/Vulkan/GPU_Vulkan.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Common/Vulkan/VulkanContext.cpp b/Common/Vulkan/VulkanContext.cpp index aeb29f20eaf2..299641d2680a 100644 --- a/Common/Vulkan/VulkanContext.cpp +++ b/Common/Vulkan/VulkanContext.cpp @@ -513,7 +513,7 @@ void VulkanContext::ChooseDevice(int physical_device) { memset(&featuresEnabled_, 0, sizeof(featuresEnabled_)); // Enable a few safe ones if they are available. - if (featuresAvailable_.dualSrcBlend) { + if (featuresAvailable_.dualSrcBlend && physicalDeviceProperties_[physical_device_].vendorID != VULKAN_VENDOR_QUALCOMM) { featuresEnabled_.dualSrcBlend = true; } if (featuresAvailable_.largePoints) { diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp index be0648352c9d..839cf1328470 100644 --- a/GPU/Vulkan/GPU_Vulkan.cpp +++ b/GPU/Vulkan/GPU_Vulkan.cpp @@ -217,9 +217,6 @@ void GPU_Vulkan::CheckGPUFeatures() { case VULKAN_VENDOR_INTEL: // Workaround for Intel driver bug. break; - case VULKAN_VENDOR_QUALCOMM: - // Workaround for possible Adreno driver bug, see #10421 - break; case VULKAN_VENDOR_AMD: // See issue #10074, and also #10065 (AMD) and #10109 for the choice of the driver version to check for if (vulkan_->GetPhysicalDeviceProperties(vulkan_->GetCurrentPhysicalDevice()).driverVersion >= 0x00407000)