[Libva] [PATCH] gst-vaapi: remove get_proc_address() for GL_ARB_multitexture

[Zhao, Halley]

Hi Gwenole:
I found you have fixed this issue in another way by defining the function pointer type.

However, I found these function pointer are not used at all, how about we remove them?
If we do need them in the future, I think these functions are in already in GL header files which can be used directly.


-----Original Message-----
From: Zhao, Halley 
Sent: Monday, October 29, 2012 4:03 PM
To: libva at lists.freedesktop.org
Cc: Zhao, Halley
Subject: [PATCH] gst-vaapi: remove get_proc_address() for GL_ARB_multitexture

  follows mesa glext.h update
---
 gst-libs/gst/vaapi/gstvaapiutils_glx.c |   15 ---------------
 gst-libs/gst/vaapi/gstvaapiutils_glx.h |    3 ---
 2 files changed, 18 deletions(-)

diff --git a/gst-libs/gst/vaapi/gstvaapiutils_glx.c b/gst-libs/gst/vaapi/gstvaapiutils_glx.c
index 4dbf834..1494e84 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_glx.c
+++ b/gst-libs/gst/vaapi/gstvaapiutils_glx.c
@@ -761,21 +761,6 @@ gl_init_vtable(void)
         gl_vtable->has_fragment_program = TRUE;
     }
 
-    /* GL_ARB_multitexture */
-    has_extension = (
-        find_string("GL_ARB_multitexture", gl_extensions, " ")
-    );
-    if (has_extension) {
-        gl_vtable->gl_active_texture = (PFNGLACTIVETEXTUREPROC)
-            get_proc_address("glActiveTextureARB");
-        if (!gl_vtable->gl_active_texture)
-            return NULL;
-        gl_vtable->gl_multi_tex_coord_2f = (PFNGLMULTITEXCOORD2FPROC)
-            get_proc_address("glMultiTexCoord2fARB");
-        if (!gl_vtable->gl_multi_tex_coord_2f)
-            return NULL;
-        gl_vtable->has_multitexture = TRUE;
-    }
     return gl_vtable;
 }
 
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_glx.h b/gst-libs/gst/vaapi/gstvaapiutils_glx.h
index c9a4983..c3696af 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_glx.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_glx.h
@@ -144,12 +144,9 @@ struct _GLVTable {
     PFNGLPROGRAMSTRINGARBPROC           gl_program_string;
     PFNGLGETPROGRAMIVARBPROC            gl_get_program_iv;
     PFNGLPROGRAMLOCALPARAMETER4FVARBPROC gl_program_local_parameter_4fv;
-    PFNGLACTIVETEXTUREPROC              gl_active_texture;
-    PFNGLMULTITEXCOORD2FPROC            gl_multi_tex_coord_2f;
     guint                               has_texture_from_pixmap : 1;
     guint                               has_framebuffer_object  : 1;
     guint                               has_fragment_program    : 1;
-    guint                               has_multitexture        : 1;
 };
 
 G_GNUC_INTERNAL
-- 
1.7.9.5