modules/video_output/opengl/interop_sw.c

@@ -436,8 +436,6 @@ static int
 interop_yuv_base_init(struct vlc_gl_interop *interop, GLenum tex_target,
                       vlc_fourcc_t chroma, const vlc_chroma_description_t *desc)
 {
-    (void) chroma;
-
     struct interop_formats
     {
         GLint intfmt;
@@ -606,8 +604,6 @@ static int
 interop_rgb_base_init(struct vlc_gl_interop *interop, GLenum tex_target,
                       vlc_fourcc_t chroma)
 {
-    (void) tex_target;
-
     switch (chroma)
     {
         case VLC_CODEC_RGB24:
@@ -719,8 +715,9 @@ opengl_interop_generic_init(struct vlc_gl_interop *interop, bool allow_dr)
 
     video_color_space_t space;
     const vlc_fourcc_t *list;
+    const bool is_yup = vlc_fourcc_IsYUV(interop->fmt_in.i_chroma);
 
-    if (vlc_fourcc_IsYUV(interop->fmt_in.i_chroma))
+    if (is_yup)
     {
         GLint max_texture_units = 0;
         priv->gl.GetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_units);
@@ -732,8 +729,7 @@ opengl_interop_generic_init(struct vlc_gl_interop *interop, bool allow_dr)
     }
     else if (interop->fmt_in.i_chroma == VLC_CODEC_XYZ12)
     {
-        static const vlc_fourcc_t xyz12_list[] = { VLC_CODEC_XYZ12, 0 };
-        list = xyz12_list;
+        list = NULL;
         space = COLOR_SPACE_UNDEF;
     }
     else
@@ -751,6 +747,17 @@ opengl_interop_generic_init(struct vlc_gl_interop *interop, bool allow_dr)
     if (ret == VLC_SUCCESS)
         goto interop_init;
 
+    if (!is_yup)
+    {
+        i_chroma = VLC_CODEC_RGBA;
+        ret = opengl_interop_init(interop, GL_TEXTURE_2D, i_chroma, space);
+        if (ret == VLC_SUCCESS)
+            goto interop_init;
+    }
+
+    if (list == NULL)
+        goto error;
+
     /* Check whether any fallback for the chroma is translatable to OpenGL. */
     while (*list)
     {