Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fixed OpenGL library loading functions

  • Loading branch information
antifinidictor committed Aug 9, 2011
1 parent 50781cd commit a6aea318919854fd6902c48d275c9106633e2c31
Showing with 19 additions and 2 deletions.
  1. +0 −1 configure.in
  2. +19 −1 src/video/bwindow/SDL_bopengl.cc
@@ -1238,7 +1238,6 @@ CheckBWINDOW()
{
if test x$enable_video = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW, 1, [ ])
# SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc" .cc sources have been removed
SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc"
have_video=yes
fi
@@ -42,11 +42,28 @@ static inline SDL_BApp *_GetBeApp() {
/* Passing a NULL path means load pointers from the application */
int BE_GL_LoadLibrary(_THIS, const char *path)
{
image_info info;
int32 cookie = 0;
while (get_next_image_info(0, &cookie, &info) == B_OK) {
void *location = NULL;
if( get_image_symbol(info.id, "glBegin", B_SYMBOL_TYPE_ANY,
&location) == B_OK) {

printf("HERE2\n");
_this->gl_config.dll_handle = (void *) info.id;
_this->gl_config.driver_loaded = 1;
SDL_strlcpy(_this->gl_config.driver_path, "libGL.so",
SDL_arraysize(_this->gl_config.driver_path));
}
}
#if 0
printf("\n\nLibrary loading: %s\n\n", path);
if (path == NULL) {
if (_this->gl_config.dll_handle == NULL) {
image_info info;
int32 cookie = 0;
while (get_next_image_info(0, &cookie, &info) == B_OK) {
printf(__FILE__": %d - Inside while\n",__LINE__);
void *location = NULL;
if (get_image_symbol
((image_id) cookie, "glBegin",
@@ -69,7 +86,6 @@ int BE_GL_LoadLibrary(_THIS, const char *path)
if (_this->gl_config.dll_handle == NULL) {
return BE_GL_LoadLibrary(_this, NULL);
}

/* Unload old first */
/*if (_this->gl_config.dll_handle != NULL) { */
/* Do not try to unload application itself (if LoadLibrary was called before with NULL ;) */
@@ -91,11 +107,13 @@ int BE_GL_LoadLibrary(_THIS, const char *path)
if (_this->gl_config.dll_handle != NULL) {
return 0;
} else {
printf(__FILE__": %d- gl_config.driver_loaded = 0\n", __LINE__);
_this->gl_config.dll_handle = NULL;
_this->gl_config.driver_loaded = 0;
*_this->gl_config.driver_path = '\0';
return -1;
}
#endif
}

void *BE_GL_GetProcAddress(_THIS, const char *proc)

0 comments on commit a6aea31

Please sign in to comment.