From db09d77e46128a68f06dc89d34bdc6045ace63f2 Mon Sep 17 00:00:00 2001
From: Cameron Cawley <ccawley2011@gmail.com>
Date: Sun, 14 Jul 2019 14:56:10 +0100
Subject: rpi: Update for modern systems

---
 video/out/gpu/hwdec.c          | 2 +-
 video/out/opengl/context_rpi.c | 4 ++--
 video/out/vo.c                 | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'video')

diff --git a/video/out/gpu/hwdec.c b/video/out/gpu/hwdec.c
index 751ed5944b..ed96bf529f 100644
--- a/video/out/gpu/hwdec.c
+++ b/video/out/gpu/hwdec.c
@@ -72,7 +72,7 @@ const struct ra_hwdec_driver *const ra_hwdec_drivers[] = {
 #if HAVE_VDPAU_GL_X11
     &ra_hwdec_vdpau,
 #endif
-#if HAVE_RPI
+#if HAVE_RPI_MMAL
     &ra_hwdec_rpi_overlay,
 #endif
 #if HAVE_DRMPRIME && HAVE_DRM
diff --git a/video/out/opengl/context_rpi.c b/video/out/opengl/context_rpi.c
index fbd9721b89..570d43d99c 100644
--- a/video/out/opengl/context_rpi.c
+++ b/video/out/opengl/context_rpi.c
@@ -139,7 +139,7 @@ static bool recreate_dispmanx(struct ra_ctx *ctx)
     VC_RECT_T dst = {.x = p->x, .y = p->y, .width = p->w, .height = p->h};
     VC_RECT_T src = {.width = p->w << 16, .height = p->h << 16};
     VC_DISPMANX_ALPHA_T alpha = {
-        .flags = DISPMANX_FLAGS_ALPHA_FROM_SOURCE,
+        .flags = DISPMANX_FLAGS_ALPHA_FIXED_ALL_PIXELS,
         .opacity = 0xFF,
     };
     p->window = vc_dispmanx_element_add(p->update, p->display, layer, &dst, 0,
@@ -234,7 +234,7 @@ static bool rpi_init(struct ra_ctx *ctx)
     if (!mpegl_create_context(ctx, p->egl_display, &p->egl_context, &p->egl_config))
         goto fail;
 
-    if (recreate_dispmanx(ctx) < 0)
+    if (!recreate_dispmanx(ctx))
         goto fail;
 
     mpegl_load_functions(&p->gl, ctx->log);
diff --git a/video/out/vo.c b/video/out/vo.c
index a094885112..7aafe28c64 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -68,9 +68,6 @@ const struct vo_driver *const video_out_drivers[] =
     &video_out_libmpv,
 #if HAVE_ANDROID
     &video_out_mediacodec_embed,
-#endif
-#if HAVE_RPI
-    &video_out_rpi,
 #endif
     &video_out_gpu,
 #if HAVE_VDPAU
@@ -100,6 +97,9 @@ const struct vo_driver *const video_out_drivers[] =
 #endif
 #if HAVE_DRM
     &video_out_drm,
+#endif
+#if HAVE_RPI_MMAL
+    &video_out_rpi,
 #endif
     &video_out_lavc,
     NULL
-- 
cgit v1.2.3