mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

glcolorconvert: follow the correct texture target names

Browse source
This commit is contained in:
Matthew Waters 2015-10-30 14:38:05 +11:00 committed by Tim-Philipp Müller
parent 434bbc9f01
commit 2595f73fd0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1390,14 +1390,14 @@ _mangle_texture_access (const gchar * str, GstGLTextureTarget from,
from_str = "texture2D"; from_str = "texture2D";
if (from == GST_GL_TEXTURE_TARGET_RECTANGLE) if (from == GST_GL_TEXTURE_TARGET_RECTANGLE)
from_str = "texture2DRect"; from_str = "texture2DRect";
if (from == GST_GL_TEXTURE_TARGET_OES) if (from == GST_GL_TEXTURE_TARGET_EXTERNAL_OES)
from_str = "texture2D"; from_str = "texture2D";
if (to == GST_GL_TEXTURE_TARGET_2D) if (to == GST_GL_TEXTURE_TARGET_2D)
to_str = "texture2D"; to_str = "texture2D";
if (to == GST_GL_TEXTURE_TARGET_RECTANGLE) if (to == GST_GL_TEXTURE_TARGET_RECTANGLE)
to_str = "texture2DRect"; to_str = "texture2DRect";
if (to == GST_GL_TEXTURE_TARGET_OES) if (to == GST_GL_TEXTURE_TARGET_EXTERNAL_OES)
to_str = "texture2D"; to_str = "texture2D";
/* followed by any amount of whitespace then a bracket */ /* followed by any amount of whitespace then a bracket */
@ -1431,14 +1431,14 @@ _mangle_sampler_type (const gchar * str, GstGLTextureTarget from,
from_str = "sampler2D"; from_str = "sampler2D";
if (from == GST_GL_TEXTURE_TARGET_RECTANGLE) if (from == GST_GL_TEXTURE_TARGET_RECTANGLE)
from_str = "sampler2DRect"; from_str = "sampler2DRect";
if (from == GST_GL_TEXTURE_TARGET_OES) if (from == GST_GL_TEXTURE_TARGET_EXTERNAL_OES)
from_str = "samplerExternalOES"; from_str = "samplerExternalOES";
if (to == GST_GL_TEXTURE_TARGET_2D) if (to == GST_GL_TEXTURE_TARGET_2D)
to_str = "sampler2D"; to_str = "sampler2D";
if (to == GST_GL_TEXTURE_TARGET_RECTANGLE) if (to == GST_GL_TEXTURE_TARGET_RECTANGLE)
to_str = "sampler2DRect"; to_str = "sampler2DRect";
if (to == GST_GL_TEXTURE_TARGET_OES) if (to == GST_GL_TEXTURE_TARGET_EXTERNAL_OES)
to_str = "samplerExternalOES"; to_str = "samplerExternalOES";
/* followed by some whitespace */ /* followed by some whitespace */
@ -1524,8 +1524,8 @@ _init_convert (GstGLColorConvert * convert)
if (info->templ->extensions) if (info->templ->extensions)
g_string_append (str, info->templ->extensions); g_string_append (str, info->templ->extensions);
if (convert->priv->from_texture_target == GST_GL_TEXTURE_TARGET_OES if (convert->priv->from_texture_target == GST_GL_TEXTURE_TARGET_EXTERNAL_OES
&& info->templ->target != GST_GL_TEXTURE_TARGET_OES) && info->templ->target != GST_GL_TEXTURE_TARGET_EXTERNAL_OES)
g_string_append (str, glsl_OES_extension_string); g_string_append (str, glsl_OES_extension_string);
if (info->templ->uniforms) { if (info->templ->uniforms) {