andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dri3: annotate the dri3_screen_info data as const 

dri3_screen_info is the user provide dispatch. Something that we do
not and should not change.

When using the _ptr typecast + const the compiler barfs at us
(rightfully so), so use the _rec one.

[Silence a new const mismatch warning too - ajax]

Fixes: 5631382988 ("dri3: Add DRI3 extension")
Cc: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Emil Velikov 2018-04-02 16:41:12 +01:00 committed by Adam Jackson
parent c67f2eac56
commit 66b632bb06
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dri3/dri3.c
View File

@ -45,7 +45,7 @@ dri3_close_screen(ScreenPtr screen)
}
Bool
dri3_screen_init(ScreenPtr screen, dri3_screen_info_ptr info)
dri3_screen_init(ScreenPtr screen, const dri3_screen_info_rec *info)
{
dri3_screen_generation = serverGeneration;

2
dri3/dri3.h
View File

@ -104,7 +104,7 @@ typedef struct dri3_screen_info {
} dri3_screen_info_rec, *dri3_screen_info_ptr;
extern _X_EXPORT Bool
dri3_screen_init(ScreenPtr screen, dri3_screen_info_ptr info);
dri3_screen_init(ScreenPtr screen, const dri3_screen_info_rec *info);
extern _X_EXPORT int
dri3_send_open_reply(ClientPtr client, int fd);

2
dri3/dri3_priv.h
View File

@ -49,7 +49,7 @@ typedef struct dri3_screen_priv {
CARD32 num_formats;
dri3_dmabuf_format_ptr formats;
dri3_screen_info_ptr info;
const dri3_screen_info_rec *info;
} dri3_screen_priv_rec, *dri3_screen_priv_ptr;
#define wrap(priv,real,mem,func) {\

14
dri3/dri3_screen.c
View File

@ -32,7 +32,7 @@
#include <drm_fourcc.h>
#include <unistd.h>
static inline Bool has_open(dri3_screen_info_ptr info) {
static inline Bool has_open(const dri3_screen_info_rec *info) {
if (info == NULL)
return FALSE;
@ -44,7 +44,7 @@ int
dri3_open(ClientPtr client, ScreenPtr screen, RRProviderPtr provider, int *fd)
{
dri3_screen_priv_ptr ds = dri3_screen_priv(screen);
dri3_screen_info_ptr info = ds->info;
const dri3_screen_info_rec *info = ds->info;
int rc;
if (!has_open(info))
@ -69,7 +69,7 @@ dri3_pixmap_from_fds(PixmapPtr *ppixmap, ScreenPtr screen,
CARD8 depth, CARD8 bpp, CARD64 modifier)
{
dri3_screen_priv_ptr ds = dri3_screen_priv(screen);
dri3_screen_info_ptr info = ds->info;
const dri3_screen_info_rec *info = ds->info;
PixmapPtr pixmap;
if (!info)
@ -100,7 +100,7 @@ dri3_fds_from_pixmap(PixmapPtr pixmap, int *fds,
{
ScreenPtr screen = pixmap->drawable.pScreen;
dri3_screen_priv_ptr ds = dri3_screen_priv(screen);
dri3_screen_info_ptr info = ds->info;
const dri3_screen_info_rec *info = ds->info;
if (!info)
return 0;
@ -130,7 +130,7 @@ dri3_fd_from_pixmap(PixmapPtr pixmap, CARD16 *stride, CARD32 *size)
{
ScreenPtr screen = pixmap->drawable.pScreen;
dri3_screen_priv_ptr ds = dri3_screen_priv(screen);
dri3_screen_info_ptr info = ds->info;
const dri3_screen_info_rec *info = ds->info;
CARD32 strides[4];
CARD32 offsets[4];
CARD64 modifier;
@ -170,7 +170,7 @@ static int
cache_formats_and_modifiers(ScreenPtr screen)
{
dri3_screen_priv_ptr ds = dri3_screen_priv(screen);
dri3_screen_info_ptr info = ds->info;
const dri3_screen_info_rec *info = ds->info;
CARD32 *formats = NULL;
CARD64 *modifiers = NULL;
int i;
@ -230,7 +230,7 @@ dri3_get_supported_modifiers(ScreenPtr screen, DrawablePtr drawable,
CARD64 **screen_modifiers)
{
dri3_screen_priv_ptr ds = dri3_screen_priv(screen);
dri3_screen_info_ptr info = ds->info;
const dri3_screen_info_rec *info = ds->info;
int i, j;
int ret;
CARD32 num_drawable_mods;

2
glamor/glamor_egl.c
View File

@ -797,7 +797,7 @@ glamor_dri3_open_client(ClientPtr client,
return Success;
}
static dri3_screen_info_rec glamor_dri3_info = {
static const dri3_screen_info_rec glamor_dri3_info = {
.version = 2,
.open_client = glamor_dri3_open_client,
.pixmap_from_fds = glamor_pixmap_from_fds,

2
hw/xwayland/xwayland-glamor.c
View File

@ -815,7 +815,7 @@ glamor_get_modifiers(ScreenPtr screen, CARD32 format,
}
static dri3_screen_info_rec xwl_dri3_info = {
static const dri3_screen_info_rec xwl_dri3_info = {
.version = 2,
.open = NULL,
.pixmap_from_fds = glamor_pixmap_from_fds,