diff options
| author | Eric Anholt <eric@anholt.net> | 2018-05-07 16:46:17 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-05-08 11:59:34 -0400 |
| commit | 5e86484a183f051d7a8a67ea13c23a3d6e69e76b (patch) | |
| tree | 8c9e3ba3ed6e3a70abff7cfd26b18b2c8f7d43a2 | |
| parent | 4ec02b573ef2424965d7ce2d33d150ddb92ec544 (diff) | |
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@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | dri3/dri3.h | 6 | ||||
| -rw-r--r-- | dri3/dri3_screen.c | 4 | ||||
| -rw-r--r-- | glamor/glamor.c | 4 | ||||
| -rw-r--r-- | glamor/glamor.h | 8 |
4 files changed, 11 insertions, 11 deletions
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, |