xserver: Branch 'master' - 8 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Mar 3 22:38:03 UTC 2024
Xext/xace.c | 2 +-
Xi/xiproperty.c | 4 ++--
dix/privates.c | 4 ++--
glamor/glamor.c | 16 ++++++++--------
glamor/glamor_egl.c | 16 ++++++++--------
glamor/glamor_fbo.c | 2 +-
hw/xwayland/xwayland-glamor-gbm.c | 6 +++---
miext/sync/misyncfd.c | 2 +-
miext/sync/misyncshm.c | 2 +-
randr/rrprovider.c | 2 +-
xkb/xkbInit.c | 4 ++--
11 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit e439c9c8d7072e128eaaf4c612d9360f710eb759
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 6 17:23:58 2024 +0100
xwayland: drop duplicate _X_EXPORT
These are already defined in glamor.h
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1274>
diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index 69ead78f2..7dbc9d24e 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -701,7 +701,7 @@ xwl_dri3_open_client(ClientPtr client,
return Success;
}
-_X_EXPORT PixmapPtr
+PixmapPtr
glamor_pixmap_from_fds(ScreenPtr screen, CARD8 num_fds, const int *fds,
CARD16 width, CARD16 height,
const CARD32 *strides, const CARD32 *offsets,
@@ -766,7 +766,7 @@ error:
return NULL;
}
-_X_EXPORT int
+int
glamor_egl_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
uint32_t *strides, uint32_t *offsets,
uint64_t *modifier)
@@ -836,7 +836,7 @@ glamor_egl_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
/* Not actually used, just defined here so there's something for
* _glamor_egl_fds_from_pixmap() to link against
*/
-_X_EXPORT int
+int
glamor_egl_fd_from_pixmap(ScreenPtr screen, PixmapPtr pixmap,
CARD16 *stride, CARD32 *size)
{
commit 489485ea7df0956e2e60b6484468bbffe69345c2
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 6 17:23:13 2024 +0100
dix: drop duplicate _X_EXPORT
These are already defined in privates.h
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1274>
diff --git a/dix/privates.c b/dix/privates.c
index 71a72fb22..3df845531 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -552,7 +552,7 @@ dixFreePrivates(PrivatePtr privates, DevPrivateType type)
/*
* Return size of privates for the specified type
*/
-extern _X_EXPORT int
+int
dixPrivatesSize(DevPrivateType type)
{
assert(type >= PRIVATE_SCREEN);
@@ -596,7 +596,7 @@ dixLookupPrivateOffset(RESTYPE type)
* Screen-specific privates
*/
-extern _X_EXPORT Bool
+Bool
dixRegisterScreenSpecificPrivateKey(ScreenPtr pScreen, DevPrivateKey key,
DevPrivateType type, unsigned size)
{
commit 6e90c5430a07cf215581719dbbd7589e33ea0ddc
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 6 17:12:28 2024 +0100
miext: sync: drop duplicate _X_EXPORT from .c sources
There are already defined in misyncshm.h / misyncfd.h.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1274>
diff --git a/miext/sync/misyncfd.c b/miext/sync/misyncfd.c
index 92f3b2294..fecbd0fb9 100644
--- a/miext/sync/misyncfd.c
+++ b/miext/sync/misyncfd.c
@@ -66,7 +66,7 @@ miSyncFDFromFence(DrawablePtr pDraw, SyncFence *pFence)
return (*priv->funcs.GetFenceFd)(pDraw->pScreen, pFence);
}
-_X_EXPORT Bool miSyncFdScreenInit(ScreenPtr pScreen,
+Bool miSyncFdScreenInit(ScreenPtr pScreen,
const SyncFdScreenFuncsRec *funcs)
{
SyncFdScreenPrivatePtr priv;
diff --git a/miext/sync/misyncshm.c b/miext/sync/misyncshm.c
index 01f82fc00..27bf07db1 100644
--- a/miext/sync/misyncshm.c
+++ b/miext/sync/misyncshm.c
@@ -163,7 +163,7 @@ static const SyncFdScreenFuncsRec miSyncShmScreenFuncs = {
.GetFenceFd = miSyncShmGetFenceFd
};
-_X_EXPORT Bool miSyncShmScreenInit(ScreenPtr pScreen)
+Bool miSyncShmScreenInit(ScreenPtr pScreen)
{
SyncScreenFuncsPtr funcs;
commit 25c0f8d98ac3fe9ff0e83741e5293bbc99ce88ef
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 6 17:12:04 2024 +0100
randr: drop duplicate _X_EXPORT from .c source
It's already defined in randrstr.h
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1274>
diff --git a/randr/rrprovider.c b/randr/rrprovider.c
index ab4d76be9..46469d548 100644
--- a/randr/rrprovider.c
+++ b/randr/rrprovider.c
@@ -459,7 +459,7 @@ RRProviderInit(void)
return TRUE;
}
-extern _X_EXPORT Bool
+Bool
RRProviderLookup(XID id, RRProviderPtr *provider_p)
{
int rc = dixLookupResourceByType((void **)provider_p, id,
commit 13a756d0b5b312ce7d9e131a2a55c94f932185bb
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 6 17:00:35 2024 +0100
Xi: drop duplicate _X_EXPORT from .c source
These are already defined in exevents.h.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1274>
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index d315f04d0..9c44f9d3e 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -416,7 +416,7 @@ XIResetProperties(void)
* @param buf_return Pointer to an array of at least @nelem_return values.
* @return Success or the error code if an error occurred.
*/
-_X_EXPORT int
+int
XIPropToInt(XIPropertyValuePtr val, int *nelem_return, int **buf_return)
{
int i;
@@ -486,7 +486,7 @@ XIPropToInt(XIPropertyValuePtr val, int *nelem_return, int **buf_return)
* @param buf_return Pointer to an array of at least @nelem_return values.
* @return Success or the error code if an error occurred.
*/
-_X_EXPORT int
+int
XIPropToFloat(XIPropertyValuePtr val, int *nelem_return, float **buf_return)
{
int i;
commit cc0e7fadc7cbc21b4e697a6401e528d371e12b4e
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 6 16:43:50 2024 +0100
xace: drop duplicate export of XaceHooks from .c source
it's already defined in xace.h.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1274>
diff --git a/Xext/xace.c b/Xext/xace.c
index f8f8d139b..580566a5d 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "gcstruct.h"
#include "xacestr.h"
-_X_EXPORT CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = { 0 };
+CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = { 0 };
/* Special-cased hook functions. Called by Xserver.
*/
commit e343a52fcfe1bb3d9b0fafbac57795bb7ee4b773
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 6 16:30:08 2024 +0100
glamor: drop duplicate _X_EXPORT from .c source
These are already defined in glamor.h
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1274>
diff --git a/glamor/glamor.c b/glamor/glamor.c
index 565bd67f1..805a712b5 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -89,7 +89,7 @@ glamor_init_pixmap_private_small(PixmapPtr pixmap, glamor_pixmap_private *pixmap
pixmap_priv->fbo_array = &pixmap_priv->fbo;
}
-_X_EXPORT void
+void
glamor_set_pixmap_type(PixmapPtr pixmap, glamor_pixmap_type_t type)
{
glamor_pixmap_private *pixmap_priv;
@@ -99,7 +99,7 @@ glamor_set_pixmap_type(PixmapPtr pixmap, glamor_pixmap_type_t type)
glamor_init_pixmap_private_small(pixmap, pixmap_priv);
}
-_X_EXPORT Bool
+Bool
glamor_set_pixmap_texture(PixmapPtr pixmap, unsigned int tex)
{
ScreenPtr screen = pixmap->drawable.pScreen;
@@ -129,7 +129,7 @@ glamor_set_pixmap_texture(PixmapPtr pixmap, unsigned int tex)
return TRUE;
}
-_X_EXPORT void
+void
glamor_clear_pixmap(PixmapPtr pixmap)
{
ScreenPtr screen = pixmap->drawable.pScreen;
@@ -1007,7 +1007,7 @@ glamor_supports_pixmap_import_export(ScreenPtr screen)
return glamor_priv->dri3_enabled;
}
-_X_EXPORT void
+void
glamor_set_drawable_modifiers_func(ScreenPtr screen,
GetDrawableModifiersFuncPtr func)
{
@@ -1016,7 +1016,7 @@ glamor_set_drawable_modifiers_func(ScreenPtr screen,
glamor_priv->get_drawable_modifiers = func;
}
-_X_EXPORT Bool
+Bool
glamor_get_drawable_modifiers(DrawablePtr draw, uint32_t format,
uint32_t *num_modifiers, uint64_t **modifiers)
{
@@ -1069,7 +1069,7 @@ _glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
return 0;
}
-_X_EXPORT int
+int
glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
uint32_t *strides, uint32_t *offsets,
uint64_t *modifier)
@@ -1078,7 +1078,7 @@ glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
NULL, modifier);
}
-_X_EXPORT int
+int
glamor_fd_from_pixmap(ScreenPtr screen,
PixmapPtr pixmap, CARD16 *stride, CARD32 *size)
{
@@ -1095,7 +1095,7 @@ glamor_fd_from_pixmap(ScreenPtr screen,
return fd;
}
-_X_EXPORT int
+int
glamor_shareable_fd_from_pixmap(ScreenPtr screen,
PixmapPtr pixmap, CARD16 *stride, CARD32 *size)
{
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 03bbfd2a2..918a790de 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -465,7 +465,7 @@ glamor_egl_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
#endif
}
-_X_EXPORT int
+int
glamor_egl_fd_from_pixmap(ScreenPtr screen, PixmapPtr pixmap,
CARD16 *stride, CARD32 *size)
{
@@ -520,7 +520,7 @@ glamor_egl_fd_name_from_pixmap(ScreenPtr screen,
return fd;
}
-_X_EXPORT Bool
+Bool
glamor_back_pixmap_from_fd(PixmapPtr pixmap,
int fd,
CARD16 width,
@@ -575,7 +575,7 @@ gbm_format_for_depth(CARD8 depth)
}
}
-_X_EXPORT PixmapPtr
+PixmapPtr
glamor_pixmap_from_fds(ScreenPtr screen,
CARD8 num_fds, const int *fds,
CARD16 width, CARD16 height,
@@ -629,7 +629,7 @@ glamor_pixmap_from_fds(ScreenPtr screen,
return pixmap;
}
-_X_EXPORT PixmapPtr
+PixmapPtr
glamor_pixmap_from_fd(ScreenPtr screen,
int fd,
CARD16 width,
@@ -651,7 +651,7 @@ glamor_pixmap_from_fd(ScreenPtr screen,
return pixmap;
}
-_X_EXPORT Bool
+Bool
glamor_get_formats(ScreenPtr screen,
CARD32 *num_formats, CARD32 **formats)
{
@@ -691,7 +691,7 @@ glamor_get_formats(ScreenPtr screen,
#endif
}
-_X_EXPORT Bool
+Bool
glamor_get_modifiers(ScreenPtr screen, uint32_t format,
uint32_t *num_modifiers, uint64_t **modifiers)
{
@@ -732,7 +732,7 @@ glamor_get_modifiers(ScreenPtr screen, uint32_t format,
#endif
}
-_X_EXPORT const char *
+const char *
glamor_egl_get_driver_name(ScreenPtr screen)
{
#ifdef GLAMOR_HAS_EGL_QUERY_DRIVER
@@ -773,7 +773,7 @@ glamor_egl_destroy_pixmap(PixmapPtr pixmap)
return ret;
}
-_X_EXPORT void
+void
glamor_egl_exchange_buffers(PixmapPtr front, PixmapPtr back)
{
EGLImageKHR temp_img;
diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c
index e045d247e..0db9d6858 100644
--- a/glamor/glamor_fbo.c
+++ b/glamor/glamor_fbo.c
@@ -355,7 +355,7 @@ glamor_pixmap_ensure_fbo(PixmapPtr pixmap, int flag)
return TRUE;
}
-_X_EXPORT void
+void
glamor_pixmap_exchange_fbos(PixmapPtr front, PixmapPtr back)
{
glamor_pixmap_private *front_priv, *back_priv;
commit 86ea30733f4066040e948dd3fb7bed63fe8591be
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 6 16:06:47 2024 +0100
xkb: drop duplicate _X_EXPORT from .c source
It's already defined in input.h, and that's where it belongs.
(we see from the header, which symbols belong to the module api)
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1274>
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 186e0f453..e1aefd144 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -662,7 +662,7 @@ InitKeyboardDeviceStructInternal(DeviceIntPtr dev, XkbRMLVOSet * rmlvo,
return FALSE;
}
-_X_EXPORT Bool
+Bool
InitKeyboardDeviceStruct(DeviceIntPtr dev, XkbRMLVOSet * rmlvo,
BellProcPtr bell_func, KbdCtrlProcPtr ctrl_func)
{
@@ -670,7 +670,7 @@ InitKeyboardDeviceStruct(DeviceIntPtr dev, XkbRMLVOSet * rmlvo,
NULL, 0, bell_func, ctrl_func);
}
-_X_EXPORT Bool
+Bool
InitKeyboardDeviceStructFromString(DeviceIntPtr dev,
const char *keymap, int keymap_length,
BellProcPtr bell_func, KbdCtrlProcPtr ctrl_func)
More information about the xorg-commit
mailing list