diff options
| author | Eric Anholt <eric@anholt.net> | 2018-05-07 16:46:18 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-05-08 11:59:36 -0400 |
| commit | 4c754b01fafc4b042d9918c05a71157f6fa6392a (patch) | |
| tree | d89e41eda369a1d1c3ff044bff0a78ab89461f21 /glamor | |
| parent | 5e86484a183f051d7a8a67ea13c23a3d6e69e76b (diff) | |
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@redhat.com>
Diffstat (limited to 'glamor')
| -rw-r--r-- | glamor/glamor.h | 4 | ||||
| -rw-r--r-- | glamor/glamor_egl.c | 4 |
2 files changed, 4 insertions, 4 deletions
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; |