XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 05:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

dri3: Switch get_drawable_modifiers to using stdint.

Browse Source 
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.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Eric Anholt
2018-05-07 16:46:17 -07:00
committed by Adam Jackson
parent 4ec02b573e
commit 5e86484a18
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dri3/dri3.h
View File

@@ -80,9 +80,9 @@ typedef int (*dri3_get_modifiers_proc) (ScreenPtr screen,
CARD64 **modifiers); CARD64 **modifiers);
typedef int (*dri3_get_drawable_modifiers_proc) (DrawablePtr draw, typedef int (*dri3_get_drawable_modifiers_proc) (DrawablePtr draw,
CARD32 format, uint32_t format,
CARD32 *num_modifiers, uint32_t *num_modifiers,
CARD64 **modifiers); uint64_t **modifiers);
typedef struct dri3_screen_info { typedef struct dri3_screen_info {
uint32_t version; uint32_t version;

4
dri3/dri3_screen.c
View File

@@ -224,8 +224,8 @@ dri3_get_supported_modifiers(ScreenPtr screen, DrawablePtr drawable,
const dri3_screen_info_rec *info = ds->info; const dri3_screen_info_rec *info = ds->info;
int i, j; int i, j;
int ret; int ret;
CARD32 num_drawable_mods; uint32_t num_drawable_mods;
CARD64 *drawable_mods; uint64_t *drawable_mods;
CARD64 *intersect_mods = NULL; CARD64 *intersect_mods = NULL;
CARD64 *screen_mods = NULL; CARD64 *screen_mods = NULL;
CARD32 format; CARD32 format;

4
glamor/glamor.c
View File

@@ -803,8 +803,8 @@ glamor_set_drawable_modifiers_func(ScreenPtr screen,
} }
_X_EXPORT Bool _X_EXPORT Bool
glamor_get_drawable_modifiers(DrawablePtr draw, CARD32 format, glamor_get_drawable_modifiers(DrawablePtr draw, uint32_t format,
CARD32 *num_modifiers, uint64_t **modifiers) uint32_t *num_modifiers, uint64_t **modifiers)
{ {
struct glamor_screen_private *glamor_priv = struct glamor_screen_private *glamor_priv =
glamor_get_screen_private(draw->pScreen); glamor_get_screen_private(draw->pScreen);

8
glamor/glamor.h
View File

@@ -61,8 +61,8 @@ typedef enum glamor_pixmap_type {
} glamor_pixmap_type_t; } glamor_pixmap_type_t;
typedef Bool (*GetDrawableModifiersFuncPtr) (DrawablePtr draw, typedef Bool (*GetDrawableModifiersFuncPtr) (DrawablePtr draw,
CARD32 format, uint32_t format,
CARD32 *num_modifiers, uint32_t *num_modifiers,
uint64_t **modifiers); uint64_t **modifiers);
#define GLAMOR_EGL_EXTERNAL_BUFFER 3 #define GLAMOR_EGL_EXTERNAL_BUFFER 3
@@ -323,8 +323,8 @@ extern _X_EXPORT Bool glamor_get_modifiers(ScreenPtr screen,
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,
CARD32 format, uint32_t format,
CARD32 *num_modifiers, uint32_t *num_modifiers,
uint64_t **modifiers); uint64_t **modifiers);
extern _X_EXPORT void glamor_set_drawable_modifiers_func(ScreenPtr screen, extern _X_EXPORT void glamor_set_drawable_modifiers_func(ScreenPtr screen,