diff options
| author | Keith Packard <keithp@keithp.com> | 2013-04-09 19:59:39 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-10-31 16:58:30 -0700 |
| commit | 563138298868f62501875d3016f03469dcffaad0 (patch) | |
| tree | a63491ea60c8a0360351b0e163a8195ce22f697d /hw | |
| parent | fdec793cdc2ef9a6ea66b311cb1068a7bd4a3be3 (diff) | |
dri3: Add DRI3 extension
Adds DRM compatible fences using futexes.
Uses FD passing to get pixmaps from DRM applications.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/dmx/dmxinit.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/Makefile.am | 4 | ||||
| -rwxr-xr-x | hw/xfree86/sdksyms.sh | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index 65416ed26..bd868a092 100644 --- a/hw/dmx/dmxinit.c +++ b/hw/dmx/dmxinit.c @@ -109,6 +109,8 @@ Bool dmxGLXSyncSwap = FALSE; Bool dmxGLXFinishSwap = FALSE; #endif +RESTYPE RRProviderType = 0; + Bool dmxIgnoreBadFontPaths = FALSE; Bool dmxAddRemoveScreens = FALSE; diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 59cfb5f6f..eea16a851 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -41,7 +41,7 @@ nodist_Xorg_SOURCES = sdksyms.c AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \ -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \ - -I$(srcdir)/dri -I$(srcdir)/dri2 + -I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3 LOCAL_LIBS = \ $(MAIN_LIB) \ @@ -59,6 +59,8 @@ LOCAL_LIBS = \ dixmods/libxorgxkb.la \ $(DRI_LIB) \ $(DRI2_LIB) \ + $(top_builddir)/dri3/libdri3.la \ + $(top_builddir)/miext/sync/libsync.la \ $(top_builddir)/mi/libmi.la \ $(top_builddir)/os/libos.la Xorg_LDADD = \ diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh index 48b48b5db..7c9734c07 100755 --- a/hw/xfree86/sdksyms.sh +++ b/hw/xfree86/sdksyms.sh @@ -99,6 +99,7 @@ cat > sdksyms.c << EOF # include "dri2.h" #endif +# include "dri3.h" /* hw/xfree86/vgahw/Makefile.am -- module */ /* |