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>
This commit is contained in:
parent
4c754b01fa
commit
ef95331603
|
@ -66,9 +66,9 @@ typedef int (*dri3_fd_from_pixmap_proc) (ScreenPtr screen,
|
||||||
typedef int (*dri3_fds_from_pixmap_proc) (ScreenPtr screen,
|
typedef int (*dri3_fds_from_pixmap_proc) (ScreenPtr screen,
|
||||||
PixmapPtr pixmap,
|
PixmapPtr pixmap,
|
||||||
int *fds,
|
int *fds,
|
||||||
CARD32 *strides,
|
uint32_t *strides,
|
||||||
CARD32 *offsets,
|
uint32_t *offsets,
|
||||||
CARD64 *modifier);
|
uint64_t *modifier);
|
||||||
|
|
||||||
typedef int (*dri3_get_formats_proc) (ScreenPtr screen,
|
typedef int (*dri3_get_formats_proc) (ScreenPtr screen,
|
||||||
CARD32 *num_formats,
|
CARD32 *num_formats,
|
||||||
|
|
|
@ -90,8 +90,8 @@ dri3_fd_from_pixmap(PixmapPtr pixmap, CARD16 *stride, CARD32 *size);
|
||||||
|
|
||||||
int
|
int
|
||||||
dri3_fds_from_pixmap(PixmapPtr pixmap, int *fds,
|
dri3_fds_from_pixmap(PixmapPtr pixmap, int *fds,
|
||||||
CARD32 *strides, CARD32 *offsets,
|
uint32_t *strides, uint32_t *offsets,
|
||||||
CARD64 *modifier);
|
uint64_t *modifier);
|
||||||
|
|
||||||
int
|
int
|
||||||
dri3_get_supported_modifiers(ScreenPtr screen, DrawablePtr drawable,
|
dri3_get_supported_modifiers(ScreenPtr screen, DrawablePtr drawable,
|
||||||
|
|
|
@ -82,8 +82,8 @@ dri3_pixmap_from_fds(PixmapPtr *ppixmap, ScreenPtr screen,
|
||||||
|
|
||||||
int
|
int
|
||||||
dri3_fds_from_pixmap(PixmapPtr pixmap, int *fds,
|
dri3_fds_from_pixmap(PixmapPtr pixmap, int *fds,
|
||||||
CARD32 *strides, CARD32 *offsets,
|
uint32_t *strides, uint32_t *offsets,
|
||||||
CARD64 *modifier)
|
uint64_t *modifier)
|
||||||
{
|
{
|
||||||
ScreenPtr screen = pixmap->drawable.pScreen;
|
ScreenPtr screen = pixmap->drawable.pScreen;
|
||||||
dri3_screen_priv_ptr ds = dri3_screen_priv(screen);
|
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;
|
ScreenPtr screen = pixmap->drawable.pScreen;
|
||||||
dri3_screen_priv_ptr ds = dri3_screen_priv(screen);
|
dri3_screen_priv_ptr ds = dri3_screen_priv(screen);
|
||||||
const dri3_screen_info_rec *info = ds->info;
|
const dri3_screen_info_rec *info = ds->info;
|
||||||
CARD32 strides[4];
|
uint32_t strides[4];
|
||||||
CARD32 offsets[4];
|
uint32_t offsets[4];
|
||||||
CARD64 modifier;
|
uint64_t modifier;
|
||||||
int fds[4];
|
int fds[4];
|
||||||
int num_fds;
|
int num_fds;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue