Skip to content

(release/25.0) hw/xfree86/glamor_egl: do not link staticaly glx library #3473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metux wants to merge 2 commits into
base: release/25.0
Choose a base branch
from
+25 −5
Open

(release/25.0) hw/xfree86/glamor_egl: do not link staticaly glx library #3473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65d8b81
Xext/glx: exports symbols to make extension shared
cepelinas9000 Jul 1, 2026
3ba75e7
hw/xfree86/glamor_egl: do not link staticaly glx library
cepelinas9000 Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions glx/extension_string.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
#ifndef GLX_EXTENSION_STRING_H
#define GLX_EXTENSION_STRING_H

#include <X11/Xfuncproto.h>

enum {
/* GLX_ARB_get_proc_address is implemented on the client. */
ARB_context_flush_control_bit = 0,
Expand Down Expand Up @@ -74,9 +76,16 @@ enum {

#define __GLX_EXT_BYTES ((__NUM_GLX_EXTS + 7) / 8)

/* exported for glamor */
_X_EXPORT
extern int __glXGetExtensionString(const unsigned char *enable_bits,
char *buffer);
/* exported for glamor */
_X_EXPORT
extern void __glXEnableExtension(unsigned char *enable_bits, const char *ext);

/* exported for glamor */
_X_EXPORT
extern void __glXInitExtensionEnableBits(unsigned char *enable_bits);

#endif /* GLX_EXTENSION_STRING_H */
7 changes: 5 additions & 2 deletions glx/glxscreens.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,10 @@ struct __GLXscreen {
unsigned char glx_enable_bits[__GLX_EXT_BYTES];
};

void __glXScreenInit(__GLXscreen * screen, ScreenPtr pScreen);
void __glXScreenDestroy(__GLXscreen * screen);
/* exported for glamor */
_X_EXPORT void __glXScreenInit(__GLXscreen * screen, ScreenPtr pScreen);

/* exported for glamor */
_X_EXPORT void __glXScreenDestroy(__GLXscreen * screen);

#endif /* !__GLX_screens_h__ */
4 changes: 3 additions & 1 deletion glx/glxserver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ void glxResumeClients(void);

typedef void (*glx_func_ptr)(void);
typedef glx_func_ptr (*glx_gpa_proc)(const char *);
void __glXsetGetProcAddress(glx_gpa_proc get_proc_address);

/* exported for glamor */
_X_EXPORT void __glXsetGetProcAddress(glx_gpa_proc get_proc_address);
void *__glGetProcAddress(const char *);

void
Expand Down
6 changes: 5 additions & 1 deletion glx/glxutil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#ifndef _glxcmds_h_
#define _glxcmds_h_

#include <X11/Xfuncproto.h>

/*
* SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
* Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
Expand Down Expand Up @@ -34,7 +36,9 @@
* other dealings in this Software without prior written authorization from
* Silicon Graphics, Inc.
*/


/* exported for glamor */
_X_EXPORT
extern GLboolean __glXDrawableInit(__GLXdrawable * drawable,
__GLXscreen * screen,
DrawablePtr pDraw, int type, XID drawID,
Expand Down
2 changes: 1 addition & 1 deletion hw/xfree86/glamor_egl/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ shared_module(
dependency('libdrm', version: '>= 2.4.46'),
gbm_dep,
],
link_with: [glamor, libxserver_glx],
link_with: [glamor ],

install: true,
install_dir: module_abi_dir,
Expand Down
2 changes: 2 additions & 0 deletions include/glx_extinit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ struct __GLXprovider {
};
extern __GLXprovider __glXDRISWRastProvider;

/* exported for glamor */
_X_EXPORT
void GlxPushProvider(__GLXprovider * provider);
Bool xorgGlxCreateVendor(void);
#else
Expand Down
Loading