RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

mac: remove unnecessary metal layer colour space update 

this logic was copied from the cocoa-cb opengl backend, since it was
assumed both layers work similar. apparently they don't and a nil value
on the metal layer means use the display colour profile, while on the
opengl layer it means undefined behaviour.

this also fixes a problem with the target-colorspace-hint option, since
moltenvk needs to set this colour space itself for a proper hint. both
mechanism would compete to set the colour space.
This commit is contained in:
der richter 2024-02-26 22:48:05 +01:00
parent 7a1b387aa9
commit c15307244f
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
video/out/mac_common.swift
View File

@ -24,8 +24,6 @@ class MacCommon: Common {
var swapTime: UInt64 = 0 var swapTime: UInt64 = 0
let swapLock: NSCondition = NSCondition() let swapLock: NSCondition = NSCondition()
var needsICCUpdate: Bool = false
@objc init(_ vo: UnsafeMutablePointer<vo>) { @objc init(_ vo: UnsafeMutablePointer<vo>) {
let newlog = mp_log_new(vo, vo.pointee.log, "mac") let newlog = mp_log_new(vo, vo.pointee.log, "mac")
super.init(newlog) super.init(newlog)
@ -65,7 +63,7 @@ class MacCommon: Common {
} }
windowDidResize() windowDidResize()
needsICCUpdate = true updateICCProfile()
} }
return true return true
@ -93,11 +91,6 @@ class MacCommon: Common {
swapTime = 0 swapTime = 0
swapLock.unlock() swapLock.unlock()
} }
if needsICCUpdate {
needsICCUpdate = false
updateICCProfile()
}
} }
func updateRenderSize(_ size: NSSize) { func updateRenderSize(_ size: NSSize) {
@ -146,13 +139,7 @@ class MacCommon: Common {
flagEvents(VO_EVENT_AMBIENT_LIGHTING_CHANGED) flagEvents(VO_EVENT_AMBIENT_LIGHTING_CHANGED)
} }
@objc override func updateICCProfile() { override func updateICCProfile() {
guard let colorSpace = window?.screen?.colorSpace else {
log.sendWarning("Couldn't update ICC Profile, no color space available")
return
}
layer?.colorspace = colorSpace.cgColorSpace
flagEvents(VO_EVENT_ICC_PROFILE_CHANGED) flagEvents(VO_EVENT_ICC_PROFILE_CHANGED)
} }
@ -166,7 +153,7 @@ class MacCommon: Common {
} }
override func windowDidChangeScreenProfile() { override func windowDidChangeScreenProfile() {
needsICCUpdate = true updateICCProfile()
} }
override func windowDidChangeBackingProperties() { override func windowDidChangeBackingProperties() {