frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Eric Anholt 2018-05-07 16:46:18 -07:00 committed by Adam Jackson
parent 5e86484a18
commit 4c754b01fa
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dri3/dri3.h
View File

@ -75,9 +75,9 @@ typedef int (*dri3_get_formats_proc) (ScreenPtr screen,
CARD32 **formats); CARD32 **formats);
typedef int (*dri3_get_modifiers_proc) (ScreenPtr screen, typedef int (*dri3_get_modifiers_proc) (ScreenPtr screen,
CARD32 format, uint32_t format,
CARD32 *num_modifiers, uint32_t *num_modifiers,
CARD64 **modifiers); uint64_t **modifiers);
typedef int (*dri3_get_drawable_modifiers_proc) (DrawablePtr draw, typedef int (*dri3_get_drawable_modifiers_proc) (DrawablePtr draw,
uint32_t format, uint32_t format,

4
dri3/dri3_screen.c
View File

@ -160,8 +160,8 @@ cache_formats_and_modifiers(ScreenPtr screen)
const dri3_screen_info_rec *info = ds->info; const dri3_screen_info_rec *info = ds->info;
CARD32 num_formats; CARD32 num_formats;
CARD32 *formats; CARD32 *formats;
CARD32 num_modifiers; uint32_t num_modifiers;
CARD64 *modifiers; uint64_t *modifiers;
int i; int i;
if (ds->formats_cached) if (ds->formats_cached)

4
glamor/glamor.h
View File

@ -318,8 +318,8 @@ extern _X_EXPORT Bool glamor_get_formats(ScreenPtr screen,
CARD32 **formats); CARD32 **formats);
extern _X_EXPORT Bool glamor_get_modifiers(ScreenPtr screen, extern _X_EXPORT Bool glamor_get_modifiers(ScreenPtr screen,
CARD32 format, uint32_t format,
CARD32 *num_modifiers, uint32_t *num_modifiers,
uint64_t **modifiers); uint64_t **modifiers);
extern _X_EXPORT Bool glamor_get_drawable_modifiers(DrawablePtr draw, extern _X_EXPORT Bool glamor_get_drawable_modifiers(DrawablePtr draw,

4
glamor/glamor_egl.c
View File

@ -629,8 +629,8 @@ glamor_get_formats(ScreenPtr screen,
} }
_X_EXPORT Bool _X_EXPORT Bool
glamor_get_modifiers(ScreenPtr screen, CARD32 format, glamor_get_modifiers(ScreenPtr screen, uint32_t format,
CARD32 *num_modifiers, uint64_t **modifiers) uint32_t *num_modifiers, uint64_t **modifiers)
{ {
#ifdef GLAMOR_HAS_EGL_QUERY_DMABUF #ifdef GLAMOR_HAS_EGL_QUERY_DMABUF
struct glamor_egl_screen_private *glamor_egl; struct glamor_egl_screen_private *glamor_egl;

4
hw/xwayland/xwayland-glamor-gbm.c
View File

@ -546,8 +546,8 @@ glamor_get_formats(ScreenPtr screen,
} }
_X_EXPORT Bool _X_EXPORT Bool
glamor_get_modifiers(ScreenPtr screen, CARD32 format, glamor_get_modifiers(ScreenPtr screen, uint32_t format,
CARD32 *num_modifiers, uint64_t **modifiers) uint32_t *num_modifiers, uint64_t **modifiers)
{ {
struct xwl_screen *xwl_screen = xwl_screen_get(screen); struct xwl_screen *xwl_screen = xwl_screen_get(screen);
struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen); struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen);