qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

hopefully better win32 dynamicly loaded gl support. if nothing else,

Browse source 
gl_funcs.c is easier to read :)
This commit is contained in:
Bill Currie 2001-10-15 18:24:30 +00:00
parent 1ffb050bf9
commit fd25261ab3
2 changed files with 61 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/QF/GL/funcs.h
View file

@ -29,10 +29,11 @@
#ifndef __QF_GL_funcs_h_
#define __QF_GL_funcs_h_
#include "QF/GL/extensions.h"
#include "QF/GL/types.h"
#include "QF/qtypes.h"
#define QFGL_NEED(ret, name, args) extern ret (* qf##name) args
#define QFGL_NEED(ret, name, args) extern ret (GLAPIENTRY * qf##name) args
#include "QF/GL/qf_funcs_list.h"
#undef QFGL_NEED

111
libs/video/renderer/gl/gl_funcs.c
View file

@ -58,36 +58,76 @@ static const char rcsid[] =
// First we need to get all the function pointers declared.
#define QFGL_NEED(ret, name, args) \
ret (* qf##name) args = NULL;
ret (GLAPIENTRY * qf##name) args = NULL;
#include "QF/GL/qf_funcs_list.h"
#undef QFGL_NEED
#if defined(HAVE_DLOPEN)
static QF_glXGetProcAddressARB glGetProcAddress = NULL;
static void * (*getProcAddress) (void *handle, const char *symbol);
void *
QFGL_LoadLibrary (void)
{
void *handle;
if (!(handle = dlopen (gl_driver->string, RTLD_NOW))) {
Sys_Error ("Couldn't load OpenGL library %s: %s\n", gl_driver->string,
dlerror ());
}
getProcAddress = dlsym;
glGetProcAddress = dlsym (handle, "glXGetProcAddressARB");
return handle;
}
#elif defined(_WIN32)
static void * (APIENTRY *glGetProcAddress) (const char *) = NULL;
static FARPROC (WINAPI *getProcAddress) (HINSTANCE,LPCSTR);
void *
QFGL_LoadLibrary (void)
{
void *handle;
if (!(handle = LoadLibrary (gl_driver->string))) {
Sys_Error ("Couldn't load OpenGL library %s!\n", gl_driver->string);
}
getProcAddress = GetProcAddress;
(FARPROC)glGetProcAddress = GetProcAddress (handle, "wglGetProcAddress");
return handle;
}
#else
# error "Cannot load libraries: %s was not configured with DSO support"
// the following is to avoid other compiler errors
static QF_glXGetProcAddressARB glGetProcAddress = NULL;
static void * (*getProcAddress) (void *handle, const char *symbol);
void *
QFGL_LoadLibrary (void)
{
return 0;
}
#endif
// Then we need to open the libGL and set all the symbols.
qboolean
GLF_Init (void)
{
void *handle;
#if defined(HAVE_DLOPEN)
if (!(handle = dlopen (gl_driver->string, RTLD_NOW))) {
Sys_Error ("Couldn't load OpenGL library %s: %s\n", gl_driver->string,
dlerror ());
return false;
}
#elif defined(_WIN32)
if (!(handle = LoadLibrary (gl_driver->string))) {
Sys_Error ("Couldn't load OpenGL library %s!\n", gl_driver->string);
return false;
}
#else
# error "Cannot load libraries: %s was not configured with DSO support"
#endif
handle = QFGL_LoadLibrary ();
#define QFGL_NEED(ret, name, args) \
qf##name = QFGL_ProcAddress (handle, #name, true);
#include "QF/GL/qf_funcs_list.h"
#undef QFGL_NEED
// tell ProcAddress to clear its cache
QFGL_ProcAddress (NULL, NULL, false);
@ -99,45 +139,12 @@ void *
QFGL_ProcAddress (void *handle, const char *name, qboolean crit)
{
void *glfunc = NULL;
static qboolean inited = false;
#if defined(HAVE_DLOPEN)
static QF_glXGetProcAddressARB glGetProcAddress = NULL;
#elif defined(_WIN32)
static void * (* glGetProcAddress) (const char *) = NULL;
#else
static void *glGetProcAddress = NULL;
#endif
if (!handle || !name) {
inited = false;
return NULL;
}
if (!inited) {
inited = true;
#if defined(HAVE_DLOPEN)
glGetProcAddress = dlsym (handle, "glXGetProcAddressARB");
#elif defined(_WIN32)
(FARPROC)glGetProcAddress = GetProcAddress (handle,
"wglGetProcAddress");
#endif
}
Con_DPrintf ("DEBUG: Finding symbol %s ... ", name);
#if defined(HAVE_DLOPEN)
glfunc = dlsym (handle, name);
#elif defined(_WIN32)
glfunc = GetProcAddress (handle, name);
#endif
if (glGetProcAddress && glfunc != glGetProcAddress (name)) {
Con_DPrintf ("mismatch! [%p != %p]\n", glfunc,
glGetProcAddress (name));
return glfunc;
}
if (!glfunc && glGetProcAddress)
if (glGetProcAddress)
glfunc = glGetProcAddress (name);
if (!glfunc)
glfunc = getProcAddress (handle, name);
if (glfunc) {
Con_DPrintf ("found [%p]\n", glfunc);