diff options
| author | Piers Daniell <pdaniell@nvidia.com> | 2015-02-24 13:58:47 -0700 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-03-02 17:21:10 -0700 |
| commit | 8254bebed7609fe24902267bea25e3866f2a4bcc (patch) | |
| tree | 2dbbca6c98ac292f9892cfa823b47b7ce2725b3b /include | |
| parent | f94f9bc3358d29b8cf7c03d753808bbbb61a5a3f (diff) | |
| download | usermoji-8254bebed7609fe24902267bea25e3866f2a4bcc.tar.xz | |
Get the trace player to work with Windows
This change modifies many of the generators to use "#if
defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)" to choose between using
XCB or WIN32 native.
Diffstat (limited to 'include')
| -rw-r--r-- | include/xglLayer.h | 10 | ||||
| -rw-r--r-- | include/xglWsiWinExt.h | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/include/xglLayer.h b/include/xglLayer.h index fc192571..6a81c90f 100644 --- a/include/xglLayer.h +++ b/include/xglLayer.h @@ -6,11 +6,9 @@ #include "xgl.h" #include "xglDbg.h" -#if defined(_WIN32) -#else // WIN32 -// FIXME: NEED WINDOWS EQUIVALENT +#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA) #include "xglWsiX11Ext.h" -#endif // WIN32 +#endif #if defined(__GNUC__) && __GNUC__ >= 4 # define XGL_LAYER_EXPORT __attribute__((visibility("default"))) #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) @@ -151,9 +149,7 @@ typedef struct _XGL_LAYER_DISPATCH_TABLE xglDbgSetDeviceOptionType DbgSetDeviceOption; xglCmdDbgMarkerBeginType CmdDbgMarkerBegin; xglCmdDbgMarkerEndType CmdDbgMarkerEnd; -#if defined(_WIN32) -// FIXME: NEED WINDOWS EQUIVALENT -#else // WIN32 +#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA) xglWsiX11AssociateConnectionType WsiX11AssociateConnection; xglWsiX11GetMSCType WsiX11GetMSC; xglWsiX11CreatePresentableImageType WsiX11CreatePresentableImage; diff --git a/include/xglWsiWinExt.h b/include/xglWsiWinExt.h index 84d3eb13..b93841b1 100644 --- a/include/xglWsiWinExt.h +++ b/include/xglWsiWinExt.h @@ -3,10 +3,6 @@ #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 - // This is just to get windows to build. // Need to replace with the declarations for Windows wsi. typedef void XGL_WSI_X11_CONNECTION_INFO; |