diff options
| author | Eric Anholt <eric@anholt.net> | 2018-05-07 16:46:19 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-05-08 11:59:41 -0400 |
| commit | ef95331603ff31d3643360c399b3865db5b0b97d (patch) | |
| tree | 4d257c9a7f9eea0622ad32d907cb8633bdd60986 /dri3 | |
| parent | 4c754b01fafc4b042d9918c05a71157f6fa6392a (diff) | |
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@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'dri3')
| -rw-r--r-- | dri3/dri3.h | 6 | ||||
| -rw-r--r-- | dri3/dri3_priv.h | 4 | ||||
| -rw-r--r-- | dri3/dri3_screen.c | 10 |
3 files changed, 10 insertions, 10 deletions
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; |