openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-08 18:28:43 +00:00
Code Issues Projects Releases Wiki Activity

unbreak build with clang-16 by fixing up function definitions to match

Browse Source 
our uint64_t is an unsinged long long, but CARD64 is defined as unsigned long
so the function pointer types in both glamor and xf86-video-amdgpu were
mismatched and clang-16 treats that as an error

ok matthieu@
This commit is contained in:
robert
2023-09-06 11:42:37 +00:00
parent 60273ffa39
commit 09bc32815c
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
driver/xf86-video-amdgpu/src/amdgpu_present.c
View File

@@ -62,7 +62,7 @@ amdgpu_present_get_crtc(WindowPtr window)
}
static int
amdgpu_present_get_ust_msc(RRCrtcPtr crtc, CARD64 *ust, CARD64 *msc)
amdgpu_present_get_ust_msc(RRCrtcPtr crtc, uint64_t *ust, uint64_t *msc)
{
xf86CrtcPtr xf86_crtc = crtc->devPrivate;
drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;

2
driver/xf86-video-amdgpu/src/drmmode_display.h
View File

@@ -284,7 +284,7 @@ Bool amdgpu_do_pageflip(ScrnInfoPtr scrn, ClientPtr client,
amdgpu_drm_abort_proc abort,
enum drmmode_flip_sync flip_sync,
uint32_t target_msc);
int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc);
int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, uint64_t *ust, uint64_t *msc);
int drmmode_get_current_ust(int drm_fd, CARD64 * ust);
void drmmode_crtc_set_vrr(xf86CrtcPtr crtc, Bool enabled);

2
xserver/glamor/glamor.h
View File

@@ -276,7 +276,7 @@ extern _X_EXPORT PixmapPtr glamor_pixmap_from_fds(ScreenPtr screen,
const CARD32 *offsets,
CARD8 depth,
CARD8 bpp,
uint64_t modifier);
CARD64 modifier);
/* @glamor_pixmap_from_fd: Creates a pixmap to wrap a dma-buf fd.
*

2
xserver/glamor/glamor_egl.c
View File

@@ -552,7 +552,7 @@ glamor_pixmap_from_fds(ScreenPtr screen,
CARD16 width, CARD16 height,
const CARD32 *strides, const CARD32 *offsets,
CARD8 depth, CARD8 bpp,
uint64_t modifier)
CARD64 modifier)
{
PixmapPtr pixmap;
struct glamor_egl_screen_private *glamor_egl;