From e0c6edc81a6fcf6f9f1ab0a872aa4f2c0e5ff9e2 Mon Sep 17 00:00:00 2001 From: David Pinedo Date: Tue, 10 Feb 2015 15:02:08 -0700 Subject: Win: Build Glave replay on Windows (REQUIRES NEW CMAKE COMMAND). Starting with this commit, building XGL on Windows requires explicitly stating whether a "Release" or "Debug" build is desired when doing the initial cmake command. This is documented in the "Build.md" file. Linux trace of cube plays to completion on windows! Changes to the null driver: advertise support for both WIN WSI and X11 WSI added support for xglCreateBufferView and added a logging capability (turned off by default) Still have some issues: - x11 support emulation/replacement - Windows null driver creates a bad device queue - Need to copy libraries to dir containing the .exe Glave ext libs are now put in same dir as glvreplay64.exe... This change only affects Windows -- on Linux the libs and the glave replay progs were already in the same dir. Also added a line to BUILD.md regarding the need to have XGL.dll in PATH. --- include/xglWsiWinExt.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/xglWsiWinExt.h b/include/xglWsiWinExt.h index 73b52fb9..84d3eb13 100644 --- a/include/xglWsiWinExt.h +++ b/include/xglWsiWinExt.h @@ -3,7 +3,16 @@ #ifndef __XGLWSIWINEXT_H__ #define __XGLWSIWINEXT_H__ +// This should be moved out of this WSI header file and +// into a platform-specific file. +#define snprintf _snprintf -// TODO: create the contents of this file +// This is just to get windows to build. +// Need to replace with the declarations for Windows wsi. +typedef void XGL_WSI_X11_CONNECTION_INFO; +typedef unsigned int xcb_window_t; +typedef unsigned int xcb_randr_crtc_t; +typedef void XGL_WSI_X11_PRESENTABLE_IMAGE_CREATE_INFO; +typedef void XGL_WSI_X11_PRESENT_INFO; #endif // __XGLWSIWINEXT_H__ -- cgit v1.2.3