Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-08-24 03:19:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14492 from OatmealDome/apple-discard-bug-fixed-3

Browse Source 
VideoBackends/Vulkan: Drop BUG_BROKEN_DISCARD_WITH_EARLY_Z workaround
This commit is contained in:
OatmealDome
2026-04-02 23:55:16 -04:00
committed by GitHub
parent 0531286906 26e58ea349
commit 5e95d5e7f5
8 changed files with 70 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/VideoCommon/DriverDetails.cpp
View File

@@ -7,6 +7,10 @@
#include "Core/DolphinAnalytics.h"
#ifdef __APPLE__
#include "Common/CommonFuncs.h"
#endif
namespace DriverDetails
{
struct BugInfo
@@ -148,9 +152,9 @@ constexpr BugInfo m_known_bugs[] = {
{API_VULKAN, OS_ALL, VENDOR_QUALCOMM, DRIVER_QUALCOMM, Family::UNKNOWN, BUG_PRIMITIVE_RESTART,
-1.0, -1.0, true},
{API_VULKAN, OS_OSX, VENDOR_APPLE, DRIVER_PORTABILITY, Family::UNKNOWN,
BUG_BROKEN_DISCARD_WITH_EARLY_Z, -1.0, -1.0, true},
BUG_BROKEN_DISCARD_WITH_EARLY_Z, 1100, 1400, true},
{API_METAL, OS_OSX, VENDOR_APPLE, DRIVER_APPLE, Family::UNKNOWN,
BUG_BROKEN_DISCARD_WITH_EARLY_Z, -1.0, -1.0, true},
BUG_BROKEN_DISCARD_WITH_EARLY_Z, 1100, 1400, true},
{API_VULKAN, OS_OSX, VENDOR_INTEL, DRIVER_PORTABILITY, Family::UNKNOWN,
BUG_BROKEN_DYNAMIC_SAMPLER_INDEXING, -1.0, -1.0, true},
{API_METAL, OS_OSX, VENDOR_INTEL, DRIVER_APPLE, Family::UNKNOWN,
@@ -198,6 +202,16 @@ void Init(API api, Vendor vendor, Driver driver, const double version, const Fam
}
}
#ifdef __APPLE__
// The Metal graphics drivers are part of macOS, so we use the current macOS version as the
// driver version for Metal and Vulkan on Metal.
if (api == API_METAL || (api == API_VULKAN && driver == DRIVER_PORTABILITY))
{
Common::MacOSVersion mac_version = Common::GetMacOSVersion();
m_version = mac_version.major * 100 + mac_version.minor;
}
#endif
// Clear bug list, as the API may have changed
m_bugs.clear();

3
Source/Core/VideoCommon/UberShaderPixel.cpp
View File

@@ -1005,7 +1005,8 @@ ShaderCode GenPixelShader(APIType api_type, const ShaderHostConfig& host_config,
out.Write(" // Alpha Test\n");
if (early_depth && DriverDetails::HasBug(DriverDetails::BUG_BROKEN_DISCARD_WITH_EARLY_Z))
if (early_depth && DriverDetails::HasBug(DriverDetails::BUG_BROKEN_DISCARD_WITH_EARLY_Z) &&
host_config.backend_shader_framebuffer_fetch)
{
// Instead of using discard, fetch the framebuffer's color value and use it as the output
// for this fragment.