e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix building with glx when glXBind/ReleaseTexImageEXT are not directly available 

(based on patch by bene42).


SVN revision: 30333
This commit is contained in:
Kim Woelders 2007-06-14 22:38:22 +00:00
parent 396f6d3f1c
commit 2e90bf4fcb
2 changed files with 70 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -165,6 +165,8 @@ if test "x$enable_glx" = "xyes"; then
],[
AC_MSG_ERROR([Cannot find GLX libraries])
])
AC_CHECK_LIB(GL, glXBindTexImageEXT,
AC_DEFINE(HAVE_GLX_glXBindTexImageEXT, 1, [glXBindTexImageEXT is available]))
AC_SUBST(GLX_LIBS)
fi
AM_CONDITIONAL(HAVE_GLX, test "x$enable_glx" = "xyes")

71
src/eglx.c
View File

@ -48,6 +48,63 @@
#define TEXTURE_TARGET GLX_TEXTURE_RECTANGLE_EXT
#endif
#ifdef HAVE_GLX_glXBindTexImageEXT
#define _glXBindTexImageEXT glXBindTexImageEXT
#define _glXReleaseTexImageEXT glXReleaseTexImageEXT
#else
#include <dlfcn.h>
/* GL functions and helper */
typedef void (*glXBindTexImageEXT_func) (Display * dpy,
GLXDrawable drawable,
int buffer,
const int *attrib_list);
typedef void (*glXReleaseTexImageEXT_func) (Display * dpy,
GLXDrawable drawable,
int buffer);
typedef void (*glXFuncPtr) (void);
typedef glXFuncPtr(*glXGetProcAddress_func) (const GLubyte *);
static glXBindTexImageEXT_func _glXBindTexImageEXT;
static glXReleaseTexImageEXT_func _glXReleaseTexImageEXT;
static glXGetProcAddress_func glx_get_proc_address;
static glXFuncPtr
get_func_addr(const char *name)
{
glXFuncPtr ret = NULL;
if (glx_get_proc_address)
ret = glx_get_proc_address((const GLubyte *)name);
if (!ret)
ret = (glXFuncPtr) dlsym(RTLD_DEFAULT, name);
return ret;
}
static int
glx_funcs_init(void)
{
glx_get_proc_address = (glXGetProcAddress_func)
get_func_addr("glXGetProcAddress");
if (!glx_get_proc_address)
glx_get_proc_address = (glXGetProcAddress_func)
get_func_addr("glXGetProcAddressARB");
_glXBindTexImageEXT = (glXBindTexImageEXT_func)
get_func_addr("glXBindTexImageEXT");
_glXReleaseTexImageEXT = (glXReleaseTexImageEXT_func)
get_func_addr("glXReleaseTexImageEXT");
return !_glXBindTexImageEXT || !_glXReleaseTexImageEXT;
}
#endif /* HAVE_GLX_glXBindTexImageEXT */
static void EobjTexturesFree(void);
typedef struct
@ -186,6 +243,14 @@ EGlInit(void)
return -1;
}
#ifndef HAVE_GLX_glXBindTexImageEXT
if (glx_funcs_init())
{
Eprintf("glXBindTexImageEXT or glXReleaseTexImageEXT not available\n");
return -1;
}
#endif
egl.vi = glXGetVisualFromFBConfig(disp, egl.fbc);
egl.ctx = glXCreateNewContext(disp, egl.fbc, GLX_RGBA_TYPE, NULL, True);
@ -376,12 +441,12 @@ EGlTextureFromDrawable(Drawable draw, int mode)
switch (mode & 0xff)
{
case 0:
glXBindTexImageEXT(disp, glxpixmap, GLX_FRONT_LEFT_EXT, NULL);
_glXBindTexImageEXT(disp, glxpixmap, GLX_FRONT_LEFT_EXT, NULL);
glTexParameteri(et->target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(et->target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
break;
case 1:
glXBindTexImageEXT(disp, glxpixmap, GLX_FRONT_LEFT_EXT, NULL);
_glXBindTexImageEXT(disp, glxpixmap, GLX_FRONT_LEFT_EXT, NULL);
glTexParameteri(et->target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(et->target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
break;
@ -413,7 +478,7 @@ EGlTextureDestroy(ETexture * et)
case ETEX_TYPE_PIXMAP:
if (!et->glxpmap)
break;
glXReleaseTexImageEXT(disp, et->glxpmap, GLX_FRONT_LEFT_EXT);
_glXReleaseTexImageEXT(disp, et->glxpmap, GLX_FRONT_LEFT_EXT);
glBindTexture(et->target, 0);
glDisable(et->target);
glXDestroyPixmap(disp, et->glxpmap);