improve metal 31001 patches

Author: pyquick

oclp_r/sys_patch/patchsets/hardware/audio/modern_audio.py

@@ -81,6 +81,9 @@ def _modern_audio_patches(self) -> dict:
                         "AppleHDADisabler.kext" ,
                         "VoodooHDA.kext",
                     ],
+                    "/Library/PreferencePanes" : [
+                        "VoodooHDA.prefPane",
+                    ],
                 },
             },
         }

oclp_r/sys_patch/patchsets/hardware/graphics/amd_legacy_gcn.py

@@ -9,7 +9,7 @@
 from ...shared_patches.monterey_gva    import MontereyGVA
 from ...shared_patches.monterey_opencl import MontereyOpenCL
 from ...shared_patches.amd_opencl      import AMDOpenCL
-
+from ...shared_patches.metal_31001     import LegacyMetal31001
 from .....constants  import Constants
 from .....detections import device_probe
 
@@ -118,7 +118,9 @@ def patches(self) -> dict:
         if self.native_os() is True:
             return {}
 
-        _base = {}
+        _base = {
+            **LegacyMetal31001(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),
+        }
 
         # AMD GCN and newer GPUs can still use the native GVA stack
         _base.update({

oclp_r/sys_patch/patchsets/hardware/graphics/amd_navi.py

@@ -9,7 +9,7 @@
 from ...shared_patches.monterey_gva    import MontereyGVA
 from ...shared_patches.monterey_opencl import MontereyOpenCL
 from ...shared_patches.amd_opencl      import AMDOpenCL
-
+from ...shared_patches.metal_31001     import LegacyMetal31001
 from .....constants  import Constants
 from .....detections import device_probe
 
@@ -81,7 +81,7 @@ def _model_specific_patches(self) -> dict:
 
                         "AMDRadeonVADriver2.bundle":      "12.5",
                         "AMDRadeonX6000GLDriver.bundle":  "12.5",
-                        "AMDRadeonX6000MTLDriver.bundle": "12.5" if self._xnu_major < os_data.sequoia else "12.5-24",
+                        **({ "AMDRadeonX6000MTLDriver.bundle": f"12.5-{self._xnu_major}" }),
                         "AMDRadeonX6000Shared.bundle":    "12.5",
 
                         "AMDShared.bundle":               "12.5",
@@ -123,6 +123,7 @@ def patches(self) -> dict:
             return {}
 
         return {
+            **LegacyMetal31001(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),
             **MontereyGVA(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).revert_patches(),
             **MontereyOpenCL(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),
             **AMDOpenCL(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),

oclp_r/sys_patch/patchsets/hardware/graphics/amd_polaris.py

@@ -12,6 +12,8 @@
 from ...shared_patches.monterey_opencl import MontereyOpenCL
 from ...shared_patches.amd_opencl      import AMDOpenCL
 
+from ...shared_patches.metal_31001     import LegacyMetal31001
+
 from .....constants  import Constants
 from .....detections import device_probe
 
@@ -111,7 +113,7 @@ def _model_specific_patches(self) -> dict:
                         "AMDRadeonX4000HWServices.kext": "12.5",
                         "AMDRadeonVADriver2.bundle":     "12.5",
                         "AMDRadeonX4000GLDriver.bundle": "12.5",
-                        "AMDMTLBronzeDriver.bundle":     "12.5" if self._xnu_major < os_data.sequoia else "12.5-24",
+                        **({ "AMDMTLBronzeDriver.bundle": f"12.5-{self._xnu_major}" }),
                         "AMDShared.bundle":              "12.5",
                     },
                 },
@@ -131,6 +133,7 @@ def patches(self) -> dict:
             return self._model_specific_patches()
 
         _base = {
+            **LegacyMetal31001(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),
             **MontereyOpenCL(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),
             **self._model_specific_patches(),
         }

oclp_r/sys_patch/patchsets/hardware/graphics/amd_vega.py

@@ -9,6 +9,7 @@
 from ...shared_patches.monterey_gva    import MontereyGVA
 from ...shared_patches.monterey_opencl import MontereyOpenCL
 from ...shared_patches.amd_opencl      import AMDOpenCL
+from ...shared_patches.metal_31001     import LegacyMetal31001
 
 from .....constants  import Constants
 from .....detections import device_probe
@@ -80,7 +81,7 @@ def _model_specific_patches(self) -> dict:
 
                         "AMDRadeonVADriver2.bundle":      "12.5",
                         "AMDRadeonX5000GLDriver.bundle":  "12.5",
-                        "AMDRadeonX5000MTLDriver.bundle": "12.5" if self._xnu_major < os_data.sequoia else "12.5-24",
+                        **({ "AMDRadeonX5000MTLDriver.bundle": f"12.5-{self._xnu_major}" }),
                         "AMDRadeonX5000Shared.bundle":    "12.5",
 
                         "AMDShared.bundle":               "12.5",
@@ -123,6 +124,7 @@ def patches(self) -> dict:
 
         return {
             # AMD GCN and newer GPUs can still use the native GVA stack
+            **LegacyMetal31001(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),
             **MontereyGVA(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).revert_patches(),
 
             **MontereyOpenCL(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),

oclp_r/sys_patch/patchsets/hardware/graphics/intel_broadwell.py

@@ -9,6 +9,8 @@
 from ...shared_patches.monterey_gva    import MontereyGVA
 from ...shared_patches.monterey_opencl import MontereyOpenCL
 
+from ...shared_patches.metal_31001     import LegacyMetal31001
+
 from .....constants  import Constants
 from .....detections import device_probe
 
@@ -70,7 +72,7 @@ def _model_specific_patches(self) -> dict:
                         "AppleIntelBDWGraphics.kext":            self._resolve_monterey_framebuffers(),
                         "AppleIntelBDWGraphicsFramebuffer.kext": self._resolve_monterey_framebuffers(),
                         "AppleIntelBDWGraphicsGLDriver.bundle":  "12.5",
-                        "AppleIntelBDWGraphicsMTLDriver.bundle": "12.5-22" if self._xnu_major < os_data.sequoia else "12.5-24",
+                        **({ "AppleIntelBDWGraphicsMTLDriver.bundle": f"12.5-{self._xnu_major}" }),
                         "AppleIntelBDWGraphicsVADriver.bundle":  "12.5",
                         "AppleIntelBDWGraphicsVAME.bundle":      "12.5",
                         "AppleIntelGraphicsShared.bundle":       "12.5",
@@ -88,6 +90,7 @@ def patches(self) -> dict:
             return {}
 
         return {
+            **LegacyMetal31001(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),
             **MontereyGVA(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),
             **MontereyOpenCL(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),
             **self._model_specific_patches(),

oclp_r/sys_patch/patchsets/hardware/graphics/intel_skylake.py

@@ -10,7 +10,7 @@
 
 from .....constants  import Constants
 from .....detections import device_probe
-
+from ...shared_patches.metal_31001     import LegacyMetal31001
 from .....datasets.os_data import os_data
 
 
@@ -70,7 +70,7 @@ def _model_specific_patches(self) -> dict:
                         "AppleIntelSKLGraphics.kext":            self._resolve_monterey_framebuffers(),
                         "AppleIntelSKLGraphicsFramebuffer.kext": self._resolve_monterey_framebuffers(),
                         "AppleIntelSKLGraphicsGLDriver.bundle":  "12.5",
-                        "AppleIntelSKLGraphicsMTLDriver.bundle": "12.5" if self._xnu_major < os_data.sequoia else "12.5-24",
+                        **({ "AppleIntelSKLGraphicsMTLDriver.bundle": f"12.5-{self._xnu_major}" }),
                         "AppleIntelSKLGraphicsVADriver.bundle":  "12.5",
                         "AppleIntelSKLGraphicsVAME.bundle":      "12.5",
                         "AppleIntelGraphicsShared.bundle":       "12.5",
@@ -88,6 +88,7 @@ def patches(self) -> dict:
             return {}
 
         return {
+            **LegacyMetal31001(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),
             **MontereyOpenCL(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),
             **self._model_specific_patches(),
         }

oclp_r/sys_patch/patchsets/hardware/networking/modern_wireless.py

@@ -42,6 +42,12 @@ def native_os(self) -> bool:
         Dropped support with macOS 14, Sonoma
         """
         return self._xnu_major < os_data.sonoma.value
+    
+    def extended_os(self) -> bool:
+        """
+        Extended support with macOS 14, Sonoma
+        """
+        return self._xnu_major == os_data.sonoma.value
 
     def hardware_variant(self) -> HardwareVariant:
         """
@@ -53,7 +59,7 @@ def _patches_modern_wireless_sonoma(self) -> dict:
         """
         Extended modern wireless patches
         """
-        if self.native_os() is True:
+        if self.native_os() is True or self.extended_os() is False:
             return {}
 
         return {
@@ -106,7 +112,7 @@ def patches(self) -> dict:
             **self._patches_modern_wireless(),
         }
 
-        if self._xnu_major == os_data.sonoma:
+        if self._xnu_major == os_data.sonoma.value:
             _base.update({
                 **self._patches_modern_wireless_sonoma(),
             })

oclp_r/sys_patch/patchsets/shared_patches/metal_31001.py

@@ -0,0 +1,48 @@
+"""
+metal_31001.py: Metal 31001 patches
+"""
+
+import packaging.version
+
+from .base import BaseSharedPatchSet
+
+from ..base import PatchType, DynamicPatchset
+
+from ....datasets.os_data import os_data
+
+
+class LegacyMetal31001(BaseSharedPatchSet):
+
+    def __init__(self, xnu_major: int, xnu_minor: int, marketing_version: str) -> None:
+        super().__init__(xnu_major, xnu_minor, marketing_version)
+
+    def _os_requires_patches(self) -> bool:
+        """
+        Check if the current OS requires
+        """
+        return self._xnu_major >= os_data.ventura.value
+
+    def _patches_metal_31001_common(self) -> dict:
+        """
+        Intel Broadwell, Skylake, and AMD GCN are Metal 31001-based GPUs
+        """
+        if self._os_requires_patches() is False:
+            return {}
+
+        return {
+            "Metal 31001 Common": {
+                PatchType.OVERWRITE_SYSTEM_VOLUME: {
+                    "/System/Library/PrivateFrameworks/RenderBox.framework/Versions/A/Resources": {
+                        **({ "default.metallib": f"RenderBox-{self._xnu_major}" }),
+                    }
+                },
+            }
+        }
+
+    def patches(self) -> dict:
+        """
+        Dictionary of patches
+        """
+        return {
+            **self._patches_metal_31001_common(),
+        }