fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-06-07 02:58:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'server-21.1-branch' into 'server-21.1-branch'

Browse source 
Fixed building when --disable-present option is used

See merge request xorg/xserver!847
This commit is contained in:
Hans Müller 2026-06-01 08:53:07 +00:00
commit 2ac23ff767
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hw/xfree86/drivers/modesetting/Makefile.am
View file

@ -44,6 +44,10 @@ modesetting_drv_la_LDFLAGS = -module -avoid-version
modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS)
modesetting_drv_ladir = @moduledir@/drivers
if PRESENT
present_c=present.c
endif
modesetting_drv_la_SOURCES = \
dri2.c \
driver.c \
@ -52,7 +56,7 @@ modesetting_drv_la_SOURCES = \
drmmode_display.h \
dumb_bo.c \
dumb_bo.h \
present.c \
$(present_c) \
vblank.c \
pageflip.c \
$(NULL)

9
hw/xfree86/drivers/modesetting/drmmode_display.c
View file

@ -49,7 +49,9 @@
#include <xf86drm.h>
#include "xf86Crtc.h"
#include "drmmode_display.h"
#ifdef PRESENT
#include "present.h"
#endif
#include <cursorstr.h>
@ -233,8 +235,11 @@ get_drawable_modifiers(DrawablePtr draw, uint32_t format,
ScrnInfoPtr scrn = xf86ScreenToScrn(draw->pScreen);
modesettingPtr ms = modesettingPTR(scrn);
if (!present_can_window_flip((WindowPtr) draw) ||
!ms->drmmode.pageflip || ms->drmmode.dri2_flipping || !scrn->vtSema) {
if (!ms->drmmode.pageflip || ms->drmmode.dri2_flipping || !scrn->vtSema
#ifdef PRESENT
|| !present_can_window_flip((WindowPtr) draw)
#endif
) {
*num_modifiers = 0;
*modifiers = NULL;
return TRUE;

6
os/utils.c
View file

@ -112,7 +112,9 @@ __stdcall unsigned long GetTickCount(void);
#include "miinitext.h"
#ifdef PRESENT
#include "present.h"
#endif
Bool noTestExtensions;
@ -540,7 +542,9 @@ UseMsg(void)
ErrorF
("-deferglyphs [none|all|16] defer loading of [no|all|16-bit] glyphs\n");
ErrorF("-f # bell base (0-100)\n");
#ifdef PRESENT
ErrorF("-fakescreenfps # fake screen default fps (1-600)\n");
#endif
ErrorF("-fp string default font path\n");
ErrorF("-help prints message with these options\n");
ErrorF("+iglx Allow creating indirect GLX contexts\n");
@ -793,6 +797,7 @@ ProcessCommandLine(int argc, char *argv[])
else
UseMsg();
}
#ifdef PRESENT
else if (strcmp(argv[i], "-fakescreenfps") == 0) {
if (++i < argc) {
FakeScreenFps = (uint32_t) atoi(argv[i]);
@ -802,6 +807,7 @@ ProcessCommandLine(int argc, char *argv[])
else
UseMsg();
}
#endif
else if (strcmp(argv[i], "-fp") == 0) {
if (++i < argc) {
defaultFontPath = argv[i];