Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
3
3p-libepoxy
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Third Party
3p-libepoxy
Commits
c5c3bff6
Commit
c5c3bff6
authored
3 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
vendor source 1.5.9
parent
b41c5dec
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libepoxy/meson.build
+1
-1
1 addition, 1 deletion
libepoxy/meson.build
libepoxy/src/dispatch_common.c
+12
-6
12 additions, 6 deletions
libepoxy/src/dispatch_common.c
with
13 additions
and
7 deletions
libepoxy/meson.build
+
1
−
1
View file @
c5c3bff6
project
(
'libepoxy'
,
'c'
,
version
:
'1.5.
7
'
,
project
(
'libepoxy'
,
'c'
,
version
:
'1.5.
9
'
,
default_options
:
[
'buildtype=debugoptimized'
,
'c_std=gnu99'
,
...
...
This diff is collapsed.
Click to expand it.
libepoxy/src/dispatch_common.c
+
12
−
6
View file @
c5c3bff6
...
...
@@ -670,17 +670,23 @@ epoxy_load_gl(void)
get_dlopen_handle
(
&
api
.
gl_handle
,
OPENGL_LIB
,
true
,
true
);
#else
// Prefer GLX_LIB over OPENGL_LIB to maintain existing behavior.
// Using the inverse ordering OPENGL_LIB -> GLX_LIB, causes issues such as:
// https://github.com/anholt/libepoxy/issues/240 (apitrace missing calls)
// https://github.com/anholt/libepoxy/issues/252 (Xorg boot crash)
get_dlopen_handle
(
&
api
.
glx_handle
,
GLX_LIB
,
false
,
true
);
api
.
gl_handle
=
api
.
glx_handle
;
#if defined(OPENGL_LIB)
if
(
!
api
.
gl_handle
)
get_dlopen_handle
(
&
api
.
gl_handle
,
OPENGL_LIB
,
false
,
true
);
get_dlopen_handle
(
&
api
.
gl_handle
,
OPENGL_LIB
,
false
,
true
);
#endif
if
(
!
api
.
gl_handle
)
{
get_dlopen_handle
(
&
api
.
gl_handle
,
GLX_LIB
,
true
,
true
);
#if PLATFORM_HAS_GLX
if
(
!
api
.
glx_handle
)
api
.
glx_handle
=
api
.
gl_handle
;
#endif
fprintf
(
stderr
,
"Couldn't open %s or %s
\n
"
,
GLX_LIB
,
OPENGL_LIB
);
abort
();
}
#endif
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment