Commit 4c754b01 authored by Emma Anholt's avatar Emma Anholt Committed by Adam Jackson
Browse files

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's avatarAdam Jackson <ajax@redhat.com>
parent 5e86484a
......@@ -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,
......
......@@ -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)
......
......@@ -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,
......
......@@ -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;
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment