From ef2225c4a2ba6206a54be55227bf97606cc90be5 Mon Sep 17 00:00:00 2001 From: Akemi Date: Thu, 8 Mar 2018 22:17:24 +0100 Subject: cocoa-cb: fix usage of wrong fbo when off-screen when we transitioned to the new libmpv API with commit ae29725 i reintroduced an old bug that was fixed with 7f714c6 because of a dumb rebasing error on my part. the branch i based the libmpv changed on was originally without the fbo fix and on rebasing i forgot to change the variable to the proper one, basically deactivating the fix. --- osdep/macOS_mpv_helper.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'osdep') diff --git a/osdep/macOS_mpv_helper.swift b/osdep/macOS_mpv_helper.swift index 29019f77db..db650d792c 100644 --- a/osdep/macOS_mpv_helper.swift +++ b/osdep/macOS_mpv_helper.swift @@ -109,10 +109,10 @@ class MPVHelper: NSObject { // so only utilize a newly received FBO ID if it is nonzero. fbo = i != 0 ? i : fbo - var data = mpv_opengl_fbo(fbo: Int32(i), - w: Int32(surface.width), - h: Int32(surface.height), - internal_format: 0) + var data = mpv_opengl_fbo(fbo: Int32(fbo), + w: Int32(surface.width), + h: Int32(surface.height), + internal_format: 0) var params: [mpv_render_param] = [ mpv_render_param(type: MPV_RENDER_PARAM_OPENGL_FBO, data: &data), mpv_render_param(type: MPV_RENDER_PARAM_FLIP_Y, data: &flip), -- cgit v1.2.3