mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: Remove iOS/EAGL workaround for R/RG textures

Browse source 
This should be unneeded now after https://bugzilla.gnome.org/show_bug.cgi?id=732507
This commit is contained in:
Sebastian Dröge 2015-04-11 19:17:00 +02:00 committed by Tim-Philipp Müller
parent bd2821982f
commit 4a8001e683
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/gl/gstglcolorconvert.c
View file

@ -896,15 +896,11 @@ _YUV_to_RGB (GstGLColorConvert * convert)
GstVideoFormat out_format = GST_VIDEO_INFO_FORMAT (&convert->out_info); GstVideoFormat out_format = GST_VIDEO_INFO_FORMAT (&convert->out_info);
const gchar *out_format_str = gst_video_format_to_string (out_format); const gchar *out_format_str = gst_video_format_to_string (out_format);
gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str); gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str);
#if GST_GL_HAVE_PLATFORM_EAGL
gboolean texture_rg = FALSE;
#else
gboolean texture_rg = gboolean texture_rg =
gst_gl_context_check_feature (context, "GL_EXT_texture_rg") gst_gl_context_check_feature (context, "GL_EXT_texture_rg")
|| gst_gl_context_check_gl_version (context, GST_GL_API_GLES2, 3, 0) || gst_gl_context_check_gl_version (context, GST_GL_API_GLES2, 3, 0)
|| gst_gl_context_check_feature (context, "GL_ARB_texture_rg") || gst_gl_context_check_feature (context, "GL_ARB_texture_rg")
|| gst_gl_context_check_gl_version (context, GST_GL_API_OPENGL3, 3, 0); || gst_gl_context_check_gl_version (context, GST_GL_API_OPENGL3, 3, 0);
#endif
gboolean apple_ycbcr = gst_gl_context_check_feature (convert->context, gboolean apple_ycbcr = gst_gl_context_check_feature (convert->context,
"GL_APPLE_ycbcr_422"); "GL_APPLE_ycbcr_422");
gboolean in_tex_rectangular = FALSE; gboolean in_tex_rectangular = FALSE;
@ -1136,15 +1132,11 @@ _GRAY_to_RGB (GstGLColorConvert * convert)
GstVideoFormat out_format = GST_VIDEO_INFO_FORMAT (&convert->out_info); GstVideoFormat out_format = GST_VIDEO_INFO_FORMAT (&convert->out_info);
const gchar *out_format_str = gst_video_format_to_string (out_format); const gchar *out_format_str = gst_video_format_to_string (out_format);
gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str); gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str);
#if GST_GL_HAVE_PLATFORM_EAGL
gboolean texture_rg = FALSE;
#else
gboolean texture_rg = gboolean texture_rg =
gst_gl_context_check_feature (context, "GL_EXT_texture_rg") gst_gl_context_check_feature (context, "GL_EXT_texture_rg")
|| gst_gl_context_check_gl_version (context, GST_GL_API_GLES2, 3, 0) || gst_gl_context_check_gl_version (context, GST_GL_API_GLES2, 3, 0)
|| gst_gl_context_check_feature (context, "GL_ARB_texture_rg") || gst_gl_context_check_feature (context, "GL_ARB_texture_rg")
|| gst_gl_context_check_gl_version (context, GST_GL_API_OPENGL3, 3, 0); || gst_gl_context_check_gl_version (context, GST_GL_API_OPENGL3, 3, 0);
#endif
info->in_n_textures = 1; info->in_n_textures = 1;
info->out_n_textures = 1; info->out_n_textures = 1;

4
gst-libs/gst/gl/gstglmemory.c
View file

@ -219,15 +219,11 @@ GstVideoGLTextureType
gst_gl_texture_type_from_format (GstGLContext * context, gst_gl_texture_type_from_format (GstGLContext * context,
GstVideoFormat v_format, guint plane) GstVideoFormat v_format, guint plane)
{ {
#if GST_GL_HAVE_PLATFORM_EAGL
gboolean texture_rg = FALSE;
#else
gboolean texture_rg = gboolean texture_rg =
gst_gl_context_check_feature (context, "GL_EXT_texture_rg") gst_gl_context_check_feature (context, "GL_EXT_texture_rg")
|| gst_gl_context_check_gl_version (context, GST_GL_API_GLES2, 3, 0) || gst_gl_context_check_gl_version (context, GST_GL_API_GLES2, 3, 0)
|| gst_gl_context_check_feature (context, "GL_ARB_texture_rg") || gst_gl_context_check_feature (context, "GL_ARB_texture_rg")
|| gst_gl_context_check_gl_version (context, GST_GL_API_OPENGL3, 3, 0); || gst_gl_context_check_gl_version (context, GST_GL_API_OPENGL3, 3, 0);
#endif
guint n_plane_components; guint n_plane_components;
switch (v_format) { switch (v_format) {