summaryrefslogtreecommitdiff
path: root/gst-libs
diff options
context:
space:
mode:
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-09-27 11:08:58 +0200
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-09-27 11:08:58 +0200
commita6a1ea09a35aa4874394ba36f3500b431cb8f511 (patch)
tree5764c1fbb2d0b92265a67776a0de57eef00a4e01 /gst-libs
parent5db2e93d3c930fd8470cfdcd26f514d1cebc59a0 (diff)
utils: drop unused GLX helpers.
Remove helpers for GL_ARB_fragment_program and GL_ARB_multitexture extensions since they are not used throughout gstreamer-vaapi.
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/gst/vaapi/gstvaapiutils_glx.c48
-rw-r--r--gst-libs/gst/vaapi/gstvaapiutils_glx.h17
2 files changed, 0 insertions, 65 deletions
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_glx.c b/gst-libs/gst/vaapi/gstvaapiutils_glx.c
index 4dbf834e..9a742ca1 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_glx.c
+++ b/gst-libs/gst/vaapi/gstvaapiutils_glx.c
@@ -728,54 +728,6 @@ gl_init_vtable(void)
return NULL;
gl_vtable->has_framebuffer_object = TRUE;
}
-
- /* GL_ARB_fragment_program */
- has_extension = (
- find_string("GL_ARB_fragment_program", gl_extensions, " ")
- );
- if (has_extension) {
- gl_vtable->gl_gen_programs = (PFNGLGENPROGRAMSARBPROC)
- get_proc_address("glGenProgramsARB");
- if (!gl_vtable->gl_gen_programs)
- return NULL;
- gl_vtable->gl_delete_programs = (PFNGLDELETEPROGRAMSARBPROC)
- get_proc_address("glDeleteProgramsARB");
- if (!gl_vtable->gl_delete_programs)
- return NULL;
- gl_vtable->gl_bind_program = (PFNGLBINDPROGRAMARBPROC)
- get_proc_address("glBindProgramARB");
- if (!gl_vtable->gl_bind_program)
- return NULL;
- gl_vtable->gl_program_string = (PFNGLPROGRAMSTRINGARBPROC)
- get_proc_address("glProgramStringARB");
- if (!gl_vtable->gl_program_string)
- return NULL;
- gl_vtable->gl_get_program_iv = (PFNGLGETPROGRAMIVARBPROC)
- get_proc_address("glGetProgramivARB");
- if (!gl_vtable->gl_get_program_iv)
- return NULL;
- gl_vtable->gl_program_local_parameter_4fv = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC)
- get_proc_address("glProgramLocalParameter4fvARB");
- if (!gl_vtable->gl_program_local_parameter_4fv)
- return NULL;
- 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 5eb5d935..912d0723 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_glx.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_glx.h
@@ -41,13 +41,6 @@ typedef GLXPixmap (*PFNGLXCREATEPIXMAPPROC)(Display *, GLXFBConfig, Pixmap, cons
typedef void (*PFNGLXDESTROYPIXMAPPROC)(Display *, GLXPixmap);
#endif
-#if GL_GLEXT_VERSION >= 85
-/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
- block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
- Redefine the type here as an interim solution */
-typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-#endif
-
#ifndef GL_FRAMEBUFFER_BINDING
#define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
#endif
@@ -145,18 +138,8 @@ struct _GLVTable {
PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC gl_framebuffer_renderbuffer;
PFNGLFRAMEBUFFERTEXTURE2DEXTPROC gl_framebuffer_texture_2d;
PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC gl_check_framebuffer_status;
- PFNGLGENPROGRAMSARBPROC gl_gen_programs;
- PFNGLDELETEPROGRAMSARBPROC gl_delete_programs;
- PFNGLBINDPROGRAMARBPROC gl_bind_program;
- 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