mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: Add #ifndef GST_REMOVE_DEPRECATED for existing deprecated API

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1764>
This commit is contained in:
Sebastian Dröge 2022-02-21 15:12:04 +02:00 committed by GStreamer Marge Bot
parent 5acb8ac559
commit bd867aea4f
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c
View file

@ -735,6 +735,7 @@ gst_gl_display_remove_window (GstGLDisplay * display, GstGLWindow * window)
return ret; return ret;
} }
#ifndef GST_REMOVE_DEPRECATED
/** /**
* gst_gl_display_find_window: * gst_gl_display_find_window:
* @display: a #GstGLDisplay * @display: a #GstGLDisplay
@ -763,6 +764,7 @@ gst_gl_display_find_window (GstGLDisplay * display, gpointer data,
return ret; return ret;
} }
#endif
/** /**
* gst_gl_display_retrieve_window: * gst_gl_display_retrieve_window:

4
subprojects/gst-plugins-base/gst-libs/gst/gl/gstglshaderstrings.c
View file

@ -80,9 +80,11 @@ const gchar *gst_gl_shader_string_vertex_mat4_vertex_transform =
"{\n" \ "{\n" \
" gl_FragColor = texture2D(tex, v_texcoord);\n" \ " gl_FragColor = texture2D(tex, v_texcoord);\n" \
"}" "}"
#ifndef GST_REMOVE_DEPRECATED
const gchar *gst_gl_shader_string_fragment_default = const gchar *gst_gl_shader_string_fragment_default =
MEDIUMP_PRECISION MEDIUMP_PRECISION
DEFAULT_FRAGMENT_BODY; DEFAULT_FRAGMENT_BODY;
#endif
#define EXTERNAL_FRAGMENT_HEADER \ #define EXTERNAL_FRAGMENT_HEADER \
"#extension GL_OES_EGL_image_external : require\n" "#extension GL_OES_EGL_image_external : require\n"
@ -94,10 +96,12 @@ const gchar *gst_gl_shader_string_fragment_default =
"{\n" \ "{\n" \
" gl_FragColor = texture2D(tex, v_texcoord);\n" \ " gl_FragColor = texture2D(tex, v_texcoord);\n" \
"}" "}"
#ifndef GST_REMOVE_DEPRECATED
const gchar *gst_gl_shader_string_fragment_external_oes_default = const gchar *gst_gl_shader_string_fragment_external_oes_default =
EXTERNAL_FRAGMENT_HEADER EXTERNAL_FRAGMENT_HEADER
MEDIUMP_PRECISION MEDIUMP_PRECISION
EXTERNAL_FRAGMENT_BODY; EXTERNAL_FRAGMENT_BODY;
#endif
/* *INDENT-ON* */ /* *INDENT-ON* */
/** /**