summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkemi <der.richter@gmx.de>2018-03-08 22:17:24 +0100
committerKevin Mitchell <kevmitch@gmail.com>2018-03-11 22:44:26 -0700
commitef2225c4a2ba6206a54be55227bf97606cc90be5 (patch)
treeda60af7d57a5661137c5ba482e77384fc5a16add
parent4485e205b95546f9f3cac6c9c337a6c4b4d8806c (diff)
downloadmpv-ef2225c4a2ba6206a54be55227bf97606cc90be5.tar.bz2
mpv-ef2225c4a2ba6206a54be55227bf97606cc90be5.tar.xz
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.
-rw-r--r--osdep/macOS_mpv_helper.swift8
1 files changed, 4 insertions, 4 deletions
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),