From bd867aea4fff62467c63045bb8c1a578dc6dad77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 21 Feb 2022 15:12:04 +0200 Subject: [PATCH] gl: Add `#ifndef GST_REMOVE_DEPRECATED` for existing deprecated API Part-of: --- subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c | 2 ++ .../gst-plugins-base/gst-libs/gst/gl/gstglshaderstrings.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c index 3996b333a9..270d215ad6 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c @@ -735,6 +735,7 @@ gst_gl_display_remove_window (GstGLDisplay * display, GstGLWindow * window) return ret; } +#ifndef GST_REMOVE_DEPRECATED /** * gst_gl_display_find_window: * @display: a #GstGLDisplay @@ -763,6 +764,7 @@ gst_gl_display_find_window (GstGLDisplay * display, gpointer data, return ret; } +#endif /** * gst_gl_display_retrieve_window: diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglshaderstrings.c b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglshaderstrings.c index ecc5da1c56..c1b4a72785 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglshaderstrings.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglshaderstrings.c @@ -80,9 +80,11 @@ const gchar *gst_gl_shader_string_vertex_mat4_vertex_transform = "{\n" \ " gl_FragColor = texture2D(tex, v_texcoord);\n" \ "}" +#ifndef GST_REMOVE_DEPRECATED const gchar *gst_gl_shader_string_fragment_default = MEDIUMP_PRECISION DEFAULT_FRAGMENT_BODY; +#endif #define EXTERNAL_FRAGMENT_HEADER \ "#extension GL_OES_EGL_image_external : require\n" @@ -94,10 +96,12 @@ const gchar *gst_gl_shader_string_fragment_default = "{\n" \ " gl_FragColor = texture2D(tex, v_texcoord);\n" \ "}" +#ifndef GST_REMOVE_DEPRECATED const gchar *gst_gl_shader_string_fragment_external_oes_default = EXTERNAL_FRAGMENT_HEADER MEDIUMP_PRECISION EXTERNAL_FRAGMENT_BODY; +#endif /* *INDENT-ON* */ /**