Marvin Scholz pushed to branch master at VideoLAN / VLC
Commits:
93b07733 by Alexandre Janniaux at 2026-01-26T02:08:37+00:00
opengl: interop_cvpx: fix TexParameteri/f mismatch
GL_CLAMP_TO_EDGE is an enum and must be set using glTexParameteri. It
was like this since ce1dc5d7263adbacd5e27dcb0701d74a597e03c4 but union
magic probably saved us from noticing weird behaviour.
- - - - -
1 changed file:
- modules/video_output/opengl/interop_cvpx.m
Changes:
=====================================
modules/video_output/opengl/interop_cvpx.m
=====================================
@@ -51,7 +51,6 @@ struct priv
PFNGLACTIVETEXTUREPROC ActiveTexture;
PFNGLBINDTEXTUREPROC BindTexture;
PFNGLTEXPARAMETERIPROC TexParameteri;
- PFNGLTEXPARAMETERFPROC TexParameterf;
} gl;
};
@@ -104,8 +103,8 @@ tc_cvpx_update(const struct vlc_gl_interop *interop,
uint32_t textures[],
priv->gl.BindTexture(interop->tex_target, textures[i]);
priv->gl.TexParameteri(interop->tex_target, GL_TEXTURE_MIN_FILTER,
GL_LINEAR);
priv->gl.TexParameteri(interop->tex_target, GL_TEXTURE_MAG_FILTER,
GL_LINEAR);
- priv->gl.TexParameterf(interop->tex_target, GL_TEXTURE_WRAP_S,
GL_CLAMP_TO_EDGE);
- priv->gl.TexParameterf(interop->tex_target, GL_TEXTURE_WRAP_T,
GL_CLAMP_TO_EDGE);
+ priv->gl.TexParameteri(interop->tex_target, GL_TEXTURE_WRAP_S,
GL_CLAMP_TO_EDGE);
+ priv->gl.TexParameteri(interop->tex_target, GL_TEXTURE_WRAP_T,
GL_CLAMP_TO_EDGE);
priv->gl.BindTexture(interop->tex_target, 0);
priv->last_cvtexs[i] = cvtex;
}
@@ -200,7 +199,6 @@ Open(struct vlc_gl_interop *interop)
LOAD_FUNCTION(ActiveTexture);
LOAD_FUNCTION(BindTexture);
LOAD_FUNCTION(TexParameteri);
- LOAD_FUNCTION(TexParameterf);
#if TARGET_OS_IPHONE
const GLenum tex_target = GL_TEXTURE_2D;
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/93b07733eed71321db313555a0db09551de5a5aa
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/93b07733eed71321db313555a0db09551de5a5aa
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
