summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--video/out/opengl/context_rpi.c39
-rw-r--r--wscript2
2 files changed, 14 insertions, 27 deletions
diff --git a/video/out/opengl/context_rpi.c b/video/out/opengl/context_rpi.c
index c51a3f1319..ee2bacb939 100644
--- a/video/out/opengl/context_rpi.c
+++ b/video/out/opengl/context_rpi.c
@@ -22,6 +22,7 @@
#include "osdep/atomic.h"
#include "video/out/win_state.h"
#include "context.h"
+#include "egl_helpers.h"
#include "context_rpi.h"
@@ -140,6 +141,15 @@ void mp_egl_rpi_destroy(struct mp_egl_rpi *p)
p->gl = NULL;
}
+static void mp_egl_rpi_destroy_base(struct mp_egl_rpi *p)
+{
+ if (p->egl_context)
+ eglDestroyContext(p->egl_display, p->egl_context);
+ p->egl_context = EGL_NO_CONTEXT;
+ eglReleaseThread();
+ p->egl_display = EGL_NO_DISPLAY;
+}
+
static int mp_egl_rpi_init_base(struct mp_egl_rpi *p)
{
p->egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
@@ -148,40 +158,17 @@ static int mp_egl_rpi_init_base(struct mp_egl_rpi *p)
goto fail;
}
- eglBindAPI(EGL_OPENGL_ES_API);
-
- p->egl_config = select_fb_config_egl(p);
- if (!p->egl_config)
- goto fail;
-
- EGLint context_attributes[] = {
- EGL_CONTEXT_CLIENT_VERSION, 2,
- EGL_NONE
- };
- p->egl_context = eglCreateContext(p->egl_display, p->egl_config,
- EGL_NO_CONTEXT, context_attributes);
-
- if (p->egl_context == EGL_NO_CONTEXT) {
- MP_FATAL(p, "Could not create EGL context!\n");
+ if (!mpegl_create_context(p->egl_display, p->log, 0, &p->egl_context,
+ &p->egl_config))
goto fail;
- }
return 0;
fail:
- mp_egl_rpi_destroy(p);
+ mp_egl_rpi_destroy_base(p);
return -1;
}
-static void mp_egl_rpi_destroy_base(struct mp_egl_rpi *p)
-{
- if (p->egl_context)
- eglDestroyContext(p->egl_display, p->egl_context);
- p->egl_context = EGL_NO_CONTEXT;
- eglReleaseThread();
- p->egl_display = EGL_NO_DISPLAY;
-}
-
static int mp_egl_rpi_init_window(struct mp_egl_rpi *p,
DISPMANX_ELEMENT_HANDLE_T window,
int w, int h)
diff --git a/wscript b/wscript
index 5b07a3bda6..00371c7da7 100644
--- a/wscript
+++ b/wscript
@@ -846,7 +846,7 @@ video_output_features = [
}, {
'name': 'egl-helpers',
'desc': 'EGL helper functions',
- 'deps_any': [ 'egl-x11', 'mali-fbdev' ],
+ 'deps_any': [ 'egl-x11', 'mali-fbdev', 'rpi' ],
'func': check_true
}
]