diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-04-13 14:10:06 -0600 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-04-16 17:33:25 +0800 |
| commit | e27c32e6490ec5cdde16ab2181bff9b5ab0abc56 (patch) | |
| tree | 4f3845dd75709966324747a5d3bccc53dc5e2277 /include | |
| parent | 5fa5c73da3500177a9d9dde26a11b50249b98bad (diff) | |
| download | usermoji-e27c32e6490ec5cdde16ab2181bff9b5ab0abc56.tar.xz | |
xgl: update xglDbg.h for XGL_INSTANCE
Add XGL_INSTANCE as the first parameter of xglDbgRegisterMsgCallback(),
xglDbgUnregisterMsgCallback(), and xglDbgSetGlobalOption().
The loader is simplified. loader_log() is modified to always output to
stderr.
glave is modified to register its message callback after xglEnumerateGpus(),
and xglDbgUnregisterMsgCallback() is called only before xglDestroyInstance().
XGL_INSTANCE is ignored by the layers and the driver for now.
Bump up API version to XGL_MAKE_VERSION(0, 56, 1).
Diffstat (limited to 'include')
| -rw-r--r-- | include/xgl.h | 2 | ||||
| -rw-r--r-- | include/xglDbg.h | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/xgl.h b/include/xgl.h index 43008aca..bffc7dfa 100644 --- a/include/xgl.h +++ b/include/xgl.h @@ -33,7 +33,7 @@ #include "xglPlatform.h" // XGL API version supported by this file -#define XGL_API_VERSION XGL_MAKE_VERSION(0, 56, 0) +#define XGL_API_VERSION XGL_MAKE_VERSION(0, 56, 1) #ifdef __cplusplus extern "C" diff --git a/include/xglDbg.h b/include/xglDbg.h index dfed1a84..d589dbe3 100644 --- a/include/xglDbg.h +++ b/include/xglDbg.h @@ -109,11 +109,11 @@ typedef void (XGLAPI *XGL_DBG_MSG_CALLBACK_FUNCTION)( // Debug functions typedef XGL_RESULT (XGLAPI *xglDbgSetValidationLevelType)(XGL_DEVICE device, XGL_VALIDATION_LEVEL validationLevel); -typedef XGL_RESULT (XGLAPI *xglDbgRegisterMsgCallbackType)(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, void* pUserData); -typedef XGL_RESULT (XGLAPI *xglDbgUnregisterMsgCallbackType)(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback); +typedef XGL_RESULT (XGLAPI *xglDbgRegisterMsgCallbackType)(XGL_INSTANCE instance, XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, void* pUserData); +typedef XGL_RESULT (XGLAPI *xglDbgUnregisterMsgCallbackType)(XGL_INSTANCE instance, XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback); typedef XGL_RESULT (XGLAPI *xglDbgSetMessageFilterType)(XGL_DEVICE device, int32_t msgCode, XGL_DBG_MSG_FILTER filter); typedef XGL_RESULT (XGLAPI *xglDbgSetObjectTagType)(XGL_BASE_OBJECT object, size_t tagSize, const void* pTag); -typedef XGL_RESULT (XGLAPI *xglDbgSetGlobalOptionType)(XGL_DBG_GLOBAL_OPTION dbgOption, size_t dataSize, const void* pData); +typedef XGL_RESULT (XGLAPI *xglDbgSetGlobalOptionType)(XGL_INSTANCE instance, XGL_DBG_GLOBAL_OPTION dbgOption, size_t dataSize, const void* pData); typedef XGL_RESULT (XGLAPI *xglDbgSetDeviceOptionType)(XGL_DEVICE device, XGL_DBG_DEVICE_OPTION dbgOption, size_t dataSize, const void* pData); typedef void (XGLAPI *xglCmdDbgMarkerBeginType)(XGL_CMD_BUFFER cmdBuffer, const char* pMarker); typedef void (XGLAPI *xglCmdDbgMarkerEndType)(XGL_CMD_BUFFER cmdBuffer); @@ -123,10 +123,12 @@ XGL_RESULT XGLAPI xglDbgSetValidationLevel( XGL_VALIDATION_LEVEL validationLevel); XGL_RESULT XGLAPI xglDbgRegisterMsgCallback( + XGL_INSTANCE instance, XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, void* pUserData); XGL_RESULT XGLAPI xglDbgUnregisterMsgCallback( + XGL_INSTANCE instance, XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback); XGL_RESULT XGLAPI xglDbgSetMessageFilter( @@ -140,6 +142,7 @@ XGL_RESULT XGLAPI xglDbgSetObjectTag( const void* pTag); XGL_RESULT XGLAPI xglDbgSetGlobalOption( + XGL_INSTANCE instance, XGL_DBG_GLOBAL_OPTION dbgOption, size_t dataSize, const void* pData); |