xserver: Branch 'master' - 6 commits
Adam Jackson
ajax at kemper.freedesktop.org
Tue May 8 16:07:53 UTC 2018
dix/dixfonts.c | 7 ++++++-
dri3/dri3.h | 18 +++++++++---------
dri3/dri3_priv.h | 4 ++--
dri3/dri3_screen.c | 18 +++++++++---------
glamor/glamor.c | 4 ++--
glamor/glamor.h | 12 ++++++------
glamor/glamor_egl.c | 4 ++--
hw/xwayland/xwayland-glamor-gbm.c | 4 ++--
hw/xwayland/xwayland.c | 2 +-
randr/rrprovider.c | 2 +-
10 files changed, 40 insertions(+), 35 deletions(-)
New commits:
commit b23a0e4ded62500f2c248f23962ff5ac718467e6
Author: Eric Anholt <eric at anholt.net>
Date: Mon May 7 16:46:20 2018 -0700
xwayland: Fix a 32-bit build warning.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index f5b03b2a6..1d6b49979 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -978,7 +978,7 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
else if (strcmp(argv[i], "-listen") == 0) {
if (xwl_screen->listen_fd_count ==
ARRAY_SIZE(xwl_screen->listen_fds))
- FatalError("Too many -listen arguments given, max is %ld\n",
+ FatalError("Too many -listen arguments given, max is %zu\n",
ARRAY_SIZE(xwl_screen->listen_fds));
xwl_screen->listen_fds[xwl_screen->listen_fd_count++] =
commit ef95331603ff31d3643360c399b3865db5b0b97d
Author: Eric Anholt <eric at anholt.net>
Date: Mon May 7 16:46:19 2018 -0700
dri3: Switch fds_from_pixmap to stdint types.
Again, this was causing 32-bit build warnings due to mixing CARD* and
stdint.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/dri3/dri3.h b/dri3/dri3.h
index 30433dc4f..02d3b03ee 100644
--- a/dri3/dri3.h
+++ b/dri3/dri3.h
@@ -66,9 +66,9 @@ typedef int (*dri3_fd_from_pixmap_proc) (ScreenPtr screen,
typedef int (*dri3_fds_from_pixmap_proc) (ScreenPtr screen,
PixmapPtr pixmap,
int *fds,
- CARD32 *strides,
- CARD32 *offsets,
- CARD64 *modifier);
+ uint32_t *strides,
+ uint32_t *offsets,
+ uint64_t *modifier);
typedef int (*dri3_get_formats_proc) (ScreenPtr screen,
CARD32 *num_formats,
diff --git a/dri3/dri3_priv.h b/dri3/dri3_priv.h
index 168b87cbb..b087a9529 100644
--- a/dri3/dri3_priv.h
+++ b/dri3/dri3_priv.h
@@ -90,8 +90,8 @@ dri3_fd_from_pixmap(PixmapPtr pixmap, CARD16 *stride, CARD32 *size);
int
dri3_fds_from_pixmap(PixmapPtr pixmap, int *fds,
- CARD32 *strides, CARD32 *offsets,
- CARD64 *modifier);
+ uint32_t *strides, uint32_t *offsets,
+ uint64_t *modifier);
int
dri3_get_supported_modifiers(ScreenPtr screen, DrawablePtr drawable,
diff --git a/dri3/dri3_screen.c b/dri3/dri3_screen.c
index a900f261d..b98259753 100644
--- a/dri3/dri3_screen.c
+++ b/dri3/dri3_screen.c
@@ -82,8 +82,8 @@ dri3_pixmap_from_fds(PixmapPtr *ppixmap, ScreenPtr screen,
int
dri3_fds_from_pixmap(PixmapPtr pixmap, int *fds,
- CARD32 *strides, CARD32 *offsets,
- CARD64 *modifier)
+ uint32_t *strides, uint32_t *offsets,
+ uint64_t *modifier)
{
ScreenPtr screen = pixmap->drawable.pScreen;
dri3_screen_priv_ptr ds = dri3_screen_priv(screen);
@@ -118,9 +118,9 @@ dri3_fd_from_pixmap(PixmapPtr pixmap, CARD16 *stride, CARD32 *size)
ScreenPtr screen = pixmap->drawable.pScreen;
dri3_screen_priv_ptr ds = dri3_screen_priv(screen);
const dri3_screen_info_rec *info = ds->info;
- CARD32 strides[4];
- CARD32 offsets[4];
- CARD64 modifier;
+ uint32_t strides[4];
+ uint32_t offsets[4];
+ uint64_t modifier;
int fds[4];
int num_fds;
commit 4c754b01fafc4b042d9918c05a71157f6fa6392a
Author: Eric Anholt <eric at anholt.net>
Date: Mon May 7 16:46:18 2018 -0700
dri3: Switch get_modifiers to using stdint.
We were mixing stdint and CARD* types, causing compiler warnings on
32-bit. Just switch over to stdint, which is what we'd like the server
to be using long term, anyway.
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/dri3/dri3.h b/dri3/dri3.h
index db3f9cd23..30433dc4f 100644
--- a/dri3/dri3.h
+++ b/dri3/dri3.h
@@ -75,9 +75,9 @@ typedef int (*dri3_get_formats_proc) (ScreenPtr screen,
CARD32 **formats);
typedef int (*dri3_get_modifiers_proc) (ScreenPtr screen,
- CARD32 format,
- CARD32 *num_modifiers,
- CARD64 **modifiers);
+ uint32_t format,
+ uint32_t *num_modifiers,
+ uint64_t **modifiers);
typedef int (*dri3_get_drawable_modifiers_proc) (DrawablePtr draw,
uint32_t format,
diff --git a/dri3/dri3_screen.c b/dri3/dri3_screen.c
index 80db96130..a900f261d 100644
--- a/dri3/dri3_screen.c
+++ b/dri3/dri3_screen.c
@@ -160,8 +160,8 @@ cache_formats_and_modifiers(ScreenPtr screen)
const dri3_screen_info_rec *info = ds->info;
CARD32 num_formats;
CARD32 *formats;
- CARD32 num_modifiers;
- CARD64 *modifiers;
+ uint32_t num_modifiers;
+ uint64_t *modifiers;
int i;
if (ds->formats_cached)
diff --git a/glamor/glamor.h b/glamor/glamor.h
index b3c6d22b4..06e11506f 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -318,8 +318,8 @@ extern _X_EXPORT Bool glamor_get_formats(ScreenPtr screen,
CARD32 **formats);
extern _X_EXPORT Bool glamor_get_modifiers(ScreenPtr screen,
- CARD32 format,
- CARD32 *num_modifiers,
+ uint32_t format,
+ uint32_t *num_modifiers,
uint64_t **modifiers);
extern _X_EXPORT Bool glamor_get_drawable_modifiers(DrawablePtr draw,
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index c38b02e2b..123e9f28d 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -629,8 +629,8 @@ glamor_get_formats(ScreenPtr screen,
}
_X_EXPORT Bool
-glamor_get_modifiers(ScreenPtr screen, CARD32 format,
- CARD32 *num_modifiers, uint64_t **modifiers)
+glamor_get_modifiers(ScreenPtr screen, uint32_t format,
+ uint32_t *num_modifiers, uint64_t **modifiers)
{
#ifdef GLAMOR_HAS_EGL_QUERY_DMABUF
struct glamor_egl_screen_private *glamor_egl;
diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index 4f7062599..29325adac 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -546,8 +546,8 @@ glamor_get_formats(ScreenPtr screen,
}
_X_EXPORT Bool
-glamor_get_modifiers(ScreenPtr screen, CARD32 format,
- CARD32 *num_modifiers, uint64_t **modifiers)
+glamor_get_modifiers(ScreenPtr screen, uint32_t format,
+ uint32_t *num_modifiers, uint64_t **modifiers)
{
struct xwl_screen *xwl_screen = xwl_screen_get(screen);
struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen);
commit 5e86484a183f051d7a8a67ea13c23a3d6e69e76b
Author: Eric Anholt <eric at anholt.net>
Date: Mon May 7 16:46:17 2018 -0700
dri3: Switch get_drawable_modifiers to using stdint.
We were mixing stdint and CARD* types, causing compiler warnings on
32-bit. Just switch over to stdint, which is what we'd like the server
to be using long term, anyway.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/dri3/dri3.h b/dri3/dri3.h
index fc76908e1..db3f9cd23 100644
--- a/dri3/dri3.h
+++ b/dri3/dri3.h
@@ -80,9 +80,9 @@ typedef int (*dri3_get_modifiers_proc) (ScreenPtr screen,
CARD64 **modifiers);
typedef int (*dri3_get_drawable_modifiers_proc) (DrawablePtr draw,
- CARD32 format,
- CARD32 *num_modifiers,
- CARD64 **modifiers);
+ uint32_t format,
+ uint32_t *num_modifiers,
+ uint64_t **modifiers);
typedef struct dri3_screen_info {
uint32_t version;
diff --git a/dri3/dri3_screen.c b/dri3/dri3_screen.c
index 59abe6ed9..80db96130 100644
--- a/dri3/dri3_screen.c
+++ b/dri3/dri3_screen.c
@@ -224,8 +224,8 @@ dri3_get_supported_modifiers(ScreenPtr screen, DrawablePtr drawable,
const dri3_screen_info_rec *info = ds->info;
int i, j;
int ret;
- CARD32 num_drawable_mods;
- CARD64 *drawable_mods;
+ uint32_t num_drawable_mods;
+ uint64_t *drawable_mods;
CARD64 *intersect_mods = NULL;
CARD64 *screen_mods = NULL;
CARD32 format;
diff --git a/glamor/glamor.c b/glamor/glamor.c
index acc7de940..86935ed98 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -803,8 +803,8 @@ glamor_set_drawable_modifiers_func(ScreenPtr screen,
}
_X_EXPORT Bool
-glamor_get_drawable_modifiers(DrawablePtr draw, CARD32 format,
- CARD32 *num_modifiers, uint64_t **modifiers)
+glamor_get_drawable_modifiers(DrawablePtr draw, uint32_t format,
+ uint32_t *num_modifiers, uint64_t **modifiers)
{
struct glamor_screen_private *glamor_priv =
glamor_get_screen_private(draw->pScreen);
diff --git a/glamor/glamor.h b/glamor/glamor.h
index 5d0659099..b3c6d22b4 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -61,8 +61,8 @@ typedef enum glamor_pixmap_type {
} glamor_pixmap_type_t;
typedef Bool (*GetDrawableModifiersFuncPtr) (DrawablePtr draw,
- CARD32 format,
- CARD32 *num_modifiers,
+ uint32_t format,
+ uint32_t *num_modifiers,
uint64_t **modifiers);
#define GLAMOR_EGL_EXTERNAL_BUFFER 3
@@ -323,8 +323,8 @@ extern _X_EXPORT Bool glamor_get_modifiers(ScreenPtr screen,
uint64_t **modifiers);
extern _X_EXPORT Bool glamor_get_drawable_modifiers(DrawablePtr draw,
- CARD32 format,
- CARD32 *num_modifiers,
+ uint32_t format,
+ uint32_t *num_modifiers,
uint64_t **modifiers);
extern _X_EXPORT void glamor_set_drawable_modifiers_func(ScreenPtr screen,
commit 4ec02b573ef2424965d7ce2d33d150ddb92ec544
Author: Eric Anholt <eric at anholt.net>
Date: Mon May 7 16:46:16 2018 -0700
randr: Fix a compiler warning on 32-bit.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/randr/rrprovider.c b/randr/rrprovider.c
index e4bc2bf6a..c430f7477 100644
--- a/randr/rrprovider.c
+++ b/randr/rrprovider.c
@@ -276,7 +276,7 @@ RRInitPrimeSyncProps(ScreenPtr pScreen)
Atom syncProp = MakeAtom(syncStr, strlen(syncStr), TRUE);
int defaultVal = TRUE;
- int validVals[2] = {FALSE, TRUE};
+ INT32 validVals[2] = {FALSE, TRUE};
int i;
for (i = 0; i < pScrPriv->numOutputs; i++) {
commit e1ccd0fa0e1081edf8a2c69ce6e8e3f67a4aecba
Author: Eric Anholt <eric at anholt.net>
Date: Mon May 7 16:46:15 2018 -0700
dix: Fix a warning about GetTimeInMillis return value in XFont2.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index cca92ed27..0ea8678bb 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -2015,6 +2015,11 @@ _remove_fs_handlers(FontPathElementPtr fpe, FontBlockHandlerProcPtr block_handle
RemoveFontWakeup(fpe);
}
+static uint32_t wrap_time_in_millis(void)
+{
+ return GetTimeInMillis();
+}
+
static const xfont2_client_funcs_rec xfont2_client_funcs = {
.version = XFONT2_CLIENT_FUNCS_VERSION,
.client_auth_generation = _client_auth_generation,
@@ -2025,7 +2030,7 @@ static const xfont2_client_funcs_rec xfont2_client_funcs = {
.get_client_resolutions = get_client_resolutions,
.get_default_point_size = get_default_point_size,
.get_new_font_client_id = get_new_font_client_id,
- .get_time_in_millis = GetTimeInMillis,
+ .get_time_in_millis = wrap_time_in_millis,
.init_fs_handlers = _init_fs_handlers,
.register_fpe_funcs = register_fpe_funcs,
.remove_fs_handlers = _remove_fs_handlers,
More information about the xorg-commit
mailing list