Skip to content

V
vlc-2-2
Commit bc577c01 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fix YV12 support in opengl output (when shader is in use).

parent 7064dbe4
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
modules/video_output/opengl.c
View file @ bc577c01
...@@ -583,15 +583,16 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl, ...@@ -583,15 +583,16 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
#else #else
/* Update the texture */ /* Update the texture */
for (unsigned j = 0; j < vgl->chroma->plane_count; j++) { for (unsigned j = 0; j < vgl->chroma->plane_count; j++) {
const int plane = vgl->fmt.i_chroma == VLC_CODEC_YV12 && j > 0 ? (3 - j) : j;
if (vgl->use_multitexture) if (vgl->use_multitexture)
vgl->ActiveTextureARB(GL_TEXTURE0_ARB + j); vgl->ActiveTextureARB(GL_TEXTURE0_ARB + j);
glBindTexture(vgl->tex_target, vgl->texture[0][j]); glBindTexture(vgl->tex_target, vgl->texture[0][j]);
glPixelStorei(GL_UNPACK_ROW_LENGTH, picture->p[j].i_pitch / picture->p[j].i_pixel_pitch); glPixelStorei(GL_UNPACK_ROW_LENGTH, picture->p[plane].i_pitch / picture->p[plane].i_pixel_pitch);
glTexSubImage2D(vgl->tex_target, 0, glTexSubImage2D(vgl->tex_target, 0,
0, 0, 0, 0,
vgl->fmt.i_width * vgl->chroma->p[j].w.num / vgl->chroma->p[j].w.den, vgl->fmt.i_width * vgl->chroma->p[plane].w.num / vgl->chroma->p[plane].w.den,
vgl->fmt.i_height * vgl->chroma->p[j].h.num / vgl->chroma->p[j].h.den, vgl->fmt.i_height * vgl->chroma->p[plane].h.num / vgl->chroma->p[plane].h.den,
vgl->tex_format, vgl->tex_type, picture->p[j].p_pixels); vgl->tex_format, vgl->tex_type, picture->p[plane].p_pixels);
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment