[vlc-commits] gl: remove deprecated glClientActiveTexture

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Aug 25 14:32:58 2017 +0200| [3fe72e26bd1848fc307427cdd23aacb44c8287bd] | committer: Thomas Guillem

gl: remove deprecated glClientActiveTexture

This function affects only glTexCoordPointer that is not used anymore (Replaced
by glVertexAttribPointer).

Refs #18575

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3fe72e26bd1848fc307427cdd23aacb44c8287bd
---

 modules/video_output/opengl/converter_cvpx.c | 2 --
 modules/video_output/opengl/converters.c     | 3 ---
 modules/video_output/opengl/internal.h       | 4 ----
 modules/video_output/opengl/vout_helper.c    | 5 -----
 4 files changed, 14 deletions(-)

diff --git a/modules/video_output/opengl/converter_cvpx.c b/modules/video_output/opengl/converter_cvpx.c
index 1c8d44e21b..fdcb5cbbb4 100644
--- a/modules/video_output/opengl/converter_cvpx.c
+++ b/modules/video_output/opengl/converter_cvpx.c
@@ -64,7 +64,6 @@ tc_cvpx_update(const opengl_tex_converter_t *tc, GLuint *textures,
     for (unsigned i = 0; i < tc->tex_count; ++i)
     {
         glActiveTexture(GL_TEXTURE0 + i);
-        glClientActiveTexture(GL_TEXTURE0 + i);
 
         CVOpenGLESTextureRef texture;
         CVReturn err = CVOpenGLESTextureCacheCreateTextureFromImage(
@@ -115,7 +114,6 @@ tc_cvpx_update(const opengl_tex_converter_t *tc, GLuint *textures,
     for (unsigned i = 0; i < tc->tex_count; ++i)
     {
         glActiveTexture(GL_TEXTURE0 + i);
-        glClientActiveTexture(GL_TEXTURE0 + i);
         glBindTexture(tc->tex_target, textures[i]);
 
         CGLError err =
diff --git a/modules/video_output/opengl/converters.c b/modules/video_output/opengl/converters.c
index e3f768f1b3..096dd09154 100644
--- a/modules/video_output/opengl/converters.c
+++ b/modules/video_output/opengl/converters.c
@@ -637,7 +637,6 @@ tc_pbo_update(const opengl_tex_converter_t *tc, GLuint *textures,
         tc->vt->BufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, size, data);
 
         glActiveTexture(GL_TEXTURE0 + i);
-        glClientActiveTexture(GL_TEXTURE0 + i);
         glBindTexture(tc->tex_target, textures[i]);
 
         glPixelStorei(GL_UNPACK_ROW_LENGTH,
@@ -753,7 +752,6 @@ tc_persistent_update(const opengl_tex_converter_t *tc, GLuint *textures,
             tc->vt->FlushMappedBufferRange(GL_PIXEL_UNPACK_BUFFER, 0,
                                             picsys->bytes[i]);
         glActiveTexture(GL_TEXTURE0 + i);
-        glClientActiveTexture(GL_TEXTURE0 + i);
         glBindTexture(tc->tex_target, textures[i]);
 
         glPixelStorei(GL_UNPACK_ROW_LENGTH,
@@ -961,7 +959,6 @@ tc_common_update(const opengl_tex_converter_t *tc, GLuint *textures,
     {
         assert(textures[i] != 0);
         glActiveTexture(GL_TEXTURE0 + i);
-        glClientActiveTexture(GL_TEXTURE0 + i);
         glBindTexture(tc->tex_target, textures[i]);
         const void *pixels = plane_offset != NULL ?
                              &pic->p[i].p_pixels[plane_offset[i]] :
diff --git a/modules/video_output/opengl/internal.h b/modules/video_output/opengl/internal.h
index 6f9817e74a..764539fb72 100644
--- a/modules/video_output/opengl/internal.h
+++ b/modules/video_output/opengl/internal.h
@@ -27,7 +27,6 @@
 #   define GLSL_VERSION "100"
 #   define PRECISION "precision highp float;"
 #   define VLCGL_PICTURE_MAX 128
-#   define glClientActiveTexture(x)
 #   define VLCGL_HAS_PBO /* PBO present as an OpenGlES 2 extension */
 #else
 #   define GLSL_VERSION "120"
@@ -145,11 +144,8 @@ typedef struct {
 
 #if defined(_WIN32)
     PFNGLACTIVETEXTUREPROC  ActiveTexture;
-    PFNGLCLIENTACTIVETEXTUREPROC  ClientActiveTexture;
-#   undef glClientActiveTexture
 #   undef glActiveTexture
 #   define glActiveTexture tc->vt->ActiveTexture
-#   define glClientActiveTexture tc->vt->ClientActiveTexture
 #endif
 
 } opengl_vtable_t;
diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index 4ea80058df..f24b174229 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -720,11 +720,8 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
 
 #if defined(_WIN32)
     GET_PROC_ADDR(ActiveTexture, true);
-    GET_PROC_ADDR(ClientActiveTexture, true);
 #   undef glActiveTexture
-#   undef glClientActiveTexture
 #   define glActiveTexture vgl->vt.ActiveTexture
-#   define glClientActiveTexture vgl->vt.ClientActiveTexture
 #endif
 #undef GET_PROC_ADDR
 
@@ -1415,7 +1412,6 @@ static void DrawWithShaders(vout_display_opengl_t *vgl, struct prgm *prgm)
     for (unsigned j = 0; j < vgl->prgm->tc.tex_count; j++) {
         assert(vgl->texture[j] != 0);
         glActiveTexture(GL_TEXTURE0+j);
-        glClientActiveTexture(GL_TEXTURE0+j);
         glBindTexture(tc->tex_target, vgl->texture[j]);
 
         vgl->vt.BindBuffer(GL_ARRAY_BUFFER, vgl->texture_buffer_object[j]);
@@ -1530,7 +1526,6 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
     }
 
     glActiveTexture(GL_TEXTURE0 + 0);
-    glClientActiveTexture(GL_TEXTURE0 + 0);
     for (int i = 0; i < vgl->region_count; i++) {
         gl_region_t *glr = &vgl->region[i];
         const GLfloat vertexCoord[] = {