summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-10-23 21:11:31 +0200
committerwm4 <wm4@nowhere>2017-10-23 21:11:44 +0200
commit2c006876418b12cc0b1c32950f14d7db649db5e1 (patch)
tree59085ba797e0f65617bca07acd8a26aeb651530e
parent1992bb51515b46555e2a75b780dc79d973b7cf3a (diff)
downloadmpv-2c006876418b12cc0b1c32950f14d7db649db5e1.tar.bz2
mpv-2c006876418b12cc0b1c32950f14d7db649db5e1.tar.xz
client API: minor bump + change entry for DRM related opengl-cb changes
Commit cfcee4cfe705 forgot those.
-rw-r--r--DOCS/client-api-changes.rst3
-rw-r--r--libmpv/client.h2
-rw-r--r--libmpv/opengl_cb.h3
3 files changed, 7 insertions, 1 deletions
diff --git a/DOCS/client-api-changes.rst b/DOCS/client-api-changes.rst
index 5fd8d84e6b..96c2882661 100644
--- a/DOCS/client-api-changes.rst
+++ b/DOCS/client-api-changes.rst
@@ -32,6 +32,9 @@ API changes
::
+ 1.26 - remove glMPGetNativeDisplay("drm") support
+ - add mpv_opengl_cb_window_pos and mpv_opengl_cb_drm_params and
+ support via glMPGetNativeDisplay() for using it
--- mpv 0.27.0 ---
1.25 - remove setting "no-" options via mpv_set_option*(). (See corresponding
deprecation in 0.23.0.)
diff --git a/libmpv/client.h b/libmpv/client.h
index eca0978fee..77e7ce09a4 100644
--- a/libmpv/client.h
+++ b/libmpv/client.h
@@ -205,7 +205,7 @@ extern "C" {
* relational operators (<, >, <=, >=).
*/
#define MPV_MAKE_VERSION(major, minor) (((major) << 16) | (minor) | 0UL)
-#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION(1, 25)
+#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION(1, 26)
/**
* The API user is allowed to "#define MPV_ENABLE_DEPRECATED 0" before
diff --git a/libmpv/opengl_cb.h b/libmpv/opengl_cb.h
index 1434c6cee3..0658a2e509 100644
--- a/libmpv/opengl_cb.h
+++ b/libmpv/opengl_cb.h
@@ -160,6 +160,9 @@ extern "C" {
* mpv_opengl_cb_window_pos struct pointer defined below.
* Note : The intended use is for hardware overlays that might require
* upscaling features (typically upscaling GL windows with drm to screen size).
+ *
+ * This is never used for GL rendering - only to map hardware overlays to
+ * GL rendering (for backends which support it).
*/
struct mpv_opengl_cb_window_pos {
int x; // left coordinates of window (usually 0)