Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libSDL
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PocketInsanity
libSDL
Commits
eb58f97b
Commit
eb58f97b
authored
Aug 09, 2011
by
Nathan Heisey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed OpenGL library loading functions
parent
06dfd29b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
2 deletions
+19
-2
configure.in
configure.in
+0
-1
SDL_bopengl.cc
src/video/bwindow/SDL_bopengl.cc
+19
-1
No files found.
configure.in
View file @
eb58f97b
...
...
@@ -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
...
...
src/video/bwindow/SDL_bopengl.cc
View file @
eb58f97b
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment