f5f4d32ac7
If windowsdriproto headers are available, build a Windows-DRI extension, which supports requests to enable local clients to directly render GL to a Windows drawable: - a query to check if WGL is being used on a screen - a query to map a fbconfigID to a native pixelformatindex - a query to map a drawable to a native handle Windows-DRI can only be useful if we are using WGL, so make an note if WGL is active on a screen. Make validGlxDrawable() public Adjust glxWinSetPixelFormat() so it doesn't require a context, just a screen and config. That enables factoring out the deferred drawable creation code as glxWinDeferredCreateDrawable() Enhance glxWinDeferredCreateDrawable(), so that pixmaps are placed into a file mapping, so they exist in memory which can be shared with the direct rendering process. Currently, this file mapping is accessed by a name generated from the XID. This will not be unique across multiple server instances. It would perhaps be better, although more complicated, to use an anonymous file mapping, and then duplicate the handle for the direct rendering process. Use glxWinDeferredCreateDrawable() to ensure the native handle exists for the Windows-DRI query to map a drawable to native handle. v2: Various printf format warning fixes v3: Fix format warnings on x86 Move some uninteresting windows-dri output to debug log level v4: check for windowsdriproto when --enable-windowsdri use windowsdriproto_CFLAGS Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
201 lines
3.9 KiB
Makefile
201 lines
3.9 KiB
Makefile
bin_PROGRAMS = XWin
|
|
|
|
if XWIN_CLIPBOARD
|
|
SRCS_CLIPBOARD = \
|
|
winclipboardinit.c \
|
|
winclipboardwrappers.c
|
|
DEFS_CLIPBOARD = -DXWIN_CLIPBOARD
|
|
CLIPBOARD_LIBS = $(top_builddir)/hw/xwin/winclipboard/libXWinclipboard.la
|
|
endif
|
|
|
|
if XWIN_GLX_WINDOWS
|
|
GLX_DIR =
|
|
DEFS_GLX_WINDOWS =
|
|
XWIN_GLX_LIBS =
|
|
if XWIN_WINDOWS_DRI
|
|
GLX_DIR += dri
|
|
DEFS_GLX_WINDOWS += -DXWIN_WINDOWS_DRI
|
|
XWIN_GLX_LIBS += $(top_builddir)/hw/xwin/dri/libWindowsDRI.la
|
|
endif
|
|
GLX_DIR += glx
|
|
DEFS_GLX_WINDOWS += -DXWIN_GLX_WINDOWS
|
|
XWIN_GLX_LIBS += $(top_builddir)/hw/xwin/glx/libXwinGLX.la
|
|
XWIN_GLX_SYS_LIBS = -lopengl32
|
|
endif
|
|
|
|
if XWIN_MULTIWINDOW
|
|
SRCS_MULTIWINDOW = \
|
|
winmultiwindowshape.c \
|
|
winmultiwindowwindow.c \
|
|
winmultiwindowwm.c \
|
|
winmultiwindowwndproc.c \
|
|
propertystore.h \
|
|
winSetAppUserModelID.c
|
|
DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW
|
|
MULTIWINDOW_SYS_LIBS = -lshlwapi -lole32
|
|
endif
|
|
|
|
if XWIN_MULTIWINDOWEXTWM
|
|
SRCS_MULTIWINDOWEXTWM = \
|
|
winwin32rootless.c \
|
|
winwin32rootlesswindow.c \
|
|
winwin32rootlesswndproc.c \
|
|
winwindowswm.c
|
|
DEFS_MULTIWINDOWEXTWM = -DXWIN_MULTIWINDOWEXTWM
|
|
MULTIWINDOWEXTWM_LIBS = $(top_builddir)/miext/rootless/librootless.la
|
|
endif
|
|
|
|
if XWIN_RANDR
|
|
SRCS_RANDR = \
|
|
winrandr.c
|
|
DEFS_RANDR = -DXWIN_RANDR
|
|
endif
|
|
|
|
if XWIN_XV
|
|
SRCS_XV = \
|
|
winvideo.c
|
|
DEFS_XV = -DXWIN_XV
|
|
endif
|
|
|
|
SRCS = InitInput.c \
|
|
InitOutput.c \
|
|
winallpriv.c \
|
|
winauth.c \
|
|
winblock.c \
|
|
wincmap.c \
|
|
winconfig.c \
|
|
wincreatewnd.c \
|
|
wincursor.c \
|
|
windialogs.c \
|
|
winengine.c \
|
|
winerror.c \
|
|
winglobals.c \
|
|
winkeybd.c \
|
|
winkeyhook.c \
|
|
winmisc.c \
|
|
winmonitors.c \
|
|
winmouse.c \
|
|
winmsg.c \
|
|
winmsgwindow.c \
|
|
winmultiwindowclass.c \
|
|
winmultiwindowicons.c \
|
|
winos.c \
|
|
winprefs.c \
|
|
winprefsyacc.y \
|
|
winprefslex.l \
|
|
winprocarg.c \
|
|
winscrinit.c \
|
|
winshadddnl.c \
|
|
winshadgdi.c \
|
|
wintaskbar.c \
|
|
wintrayicon.c \
|
|
winvalargs.c \
|
|
winwakeup.c \
|
|
winwindow.c \
|
|
winwndproc.c \
|
|
ddraw.h \
|
|
winconfig.h \
|
|
win.h \
|
|
winglobals.h \
|
|
winkeybd.h \
|
|
winkeynames.h \
|
|
winlayouts.h \
|
|
winmessages.h \
|
|
winmonitors.h \
|
|
winmsg.h \
|
|
winms.h \
|
|
winmultiwindowclass.h \
|
|
winmultiwindowicons.h \
|
|
winprefs.h \
|
|
winresource.h \
|
|
winwindow.h \
|
|
windisplay.c \
|
|
windisplay.h \
|
|
XWin.rc \
|
|
$(top_srcdir)/mi/miinitext.c \
|
|
$(SRCS_CLIPBOARD) \
|
|
$(SRCS_MULTIWINDOW) \
|
|
$(SRCS_MULTIWINDOWEXTWM) \
|
|
$(SRCS_NATIVEGDI) \
|
|
$(SRCS_PRIMARYFB) \
|
|
$(SRCS_RANDR) \
|
|
$(SRCS_XV)
|
|
|
|
DEFS = $(DEFS_CLIPBOARD) \
|
|
$(DEFS_GLX_WINDOWS) \
|
|
$(DEFS_MULTIWINDOW) \
|
|
$(DEFS_MULTIWINDOWEXTWM) \
|
|
$(DEFS_NATIVEGDI) \
|
|
$(DEFS_PRIMARYFB) \
|
|
$(DEFS_RANDR) \
|
|
$(DEFS_XV)
|
|
|
|
XWin_SOURCES = $(SRCS)
|
|
|
|
AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless
|
|
|
|
XWIN_SYS_LIBS += -ldxguid
|
|
|
|
XWIN_LIBS += \
|
|
$(top_builddir)/pseudoramiX/libPseudoramiX.la \
|
|
$(top_builddir)/Xext/libXextdpmsstubs.la \
|
|
$(top_builddir)/Xi/libXistubs.la
|
|
|
|
XWin_DEPENDENCIES = \
|
|
$(MULTIWINDOWEXTWM_LIBS) \
|
|
$(XWIN_GLX_LIBS) \
|
|
$(XWIN_LIBS) \
|
|
$(CLIPBOARD_LIBS) \
|
|
$(XSERVER_LIBS)
|
|
|
|
|
|
XWin_LDADD = \
|
|
$(MULTIWINDOWEXTWM_LIBS) \
|
|
$(XWIN_GLX_LIBS) \
|
|
$(XWIN_LIBS) \
|
|
$(CLIPBOARD_LIBS) \
|
|
$(XSERVER_LIBS) \
|
|
$(XWIN_GLX_SYS_LIBS) \
|
|
$(XSERVER_SYS_LIBS) \
|
|
$(XWIN_SYS_LIBS) \
|
|
$(MULTIWINDOW_SYS_LIBS)
|
|
|
|
XWin_LDFLAGS = -mwindows -Wl,--disable-stdcall-fixup $(LD_EXPORT_SYMBOLS_FLAG)
|
|
|
|
|
|
.rc.o:
|
|
$(AM_V_GEN)$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include
|
|
|
|
XWin.o: XWin.rc XWin.exe.manifest X.ico
|
|
|
|
winprefsyacc.h: winprefsyacc.c
|
|
winprefslex.c: winprefslex.l winprefsyacc.c winprefsyacc.h
|
|
|
|
BUILT_SOURCES = winprefsyacc.h winprefsyacc.c winprefslex.c
|
|
CLEANFILES = $(BUILT_SOURCES)
|
|
|
|
AM_YFLAGS = -d
|
|
AM_LFLAGS = -i
|
|
AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
|
|
$(XWINMODULES_CFLAGS) \
|
|
-I$(top_srcdir) \
|
|
-Wno-bad-function-cast
|
|
|
|
xwinconfigdir = $(sysconfdir)/X11
|
|
xwinconfig_DATA = system.XWinrc
|
|
|
|
install-exec-hook:
|
|
(cd $(DESTDIR)$(bindir) && rm -f X && $(LN_S) XWin$(EXEEXT) X)
|
|
|
|
EXTRA_DIST = \
|
|
$(xwinconfig_DATA) \
|
|
X.ico \
|
|
XWin.rc \
|
|
XWin.exe.manifest
|
|
|
|
relink:
|
|
$(AM_V_at)rm -f XWin$(EXEEXT) && $(MAKE) XWin$(EXEEXT)
|
|
|
|
SUBDIRS = man $(GLX_DIR) winclipboard .
|
|
DIST_SUBDIRS = man glx winclipboard .
|