From 0a5d9e25f34633181217c078405cf8c7d35dcd20 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Mon, 13 Apr 2015 14:35:54 -0600 Subject: FIXUP: update xglDbg.h for XGL_INSTANCE commit ba1c0f351db007373bf16d95e607ec4511e27164 Author: Courtney Goeltzenleuchter Date: Mon Apr 13 14:10:06 2015 -0600 xgl: update xglDbg.h for XGL_INSTANCE --- layers/glave_snapshot.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/layers/glave_snapshot.c b/layers/glave_snapshot.c index b14b4933..8cf06211 100644 --- a/layers/glave_snapshot.c +++ b/layers/glave_snapshot.c @@ -1667,7 +1667,7 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetValidationLevel(XGL_DEVICE device, X return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, void* pUserData) +XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(XGL_INSTANCE instance, XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, void* pUserData) { // This layer intercepts callbacks XGL_LAYER_DBG_FUNCTION_NODE *pNewDbgFuncNode = (XGL_LAYER_DBG_FUNCTION_NODE*)malloc(sizeof(XGL_LAYER_DBG_FUNCTION_NODE)); @@ -1680,11 +1680,11 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(XGL_DBG_MSG_CALLBAC // force callbacks if DebugAction hasn't been set already other than initial value if (g_actionIsDefault) { g_debugAction = XGL_DBG_LAYER_ACTION_CALLBACK; - } XGL_RESULT result = nextTable.DbgRegisterMsgCallback(pfnMsgCallback, pUserData); + } XGL_RESULT result = nextTable.DbgRegisterMsgCallback(instance, pfnMsgCallback, pUserData); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgUnregisterMsgCallback(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback) +XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgUnregisterMsgCallback(XGL_INSTANCE instance, XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback) { XGL_LAYER_DBG_FUNCTION_NODE *pTrav = g_pDbgFunctionHead; XGL_LAYER_DBG_FUNCTION_NODE *pPrev = pTrav; @@ -1706,7 +1706,7 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgUnregisterMsgCallback(XGL_DBG_MSG_CALLB else g_debugAction &= ~XGL_DBG_LAYER_ACTION_CALLBACK; } - XGL_RESULT result = nextTable.DbgUnregisterMsgCallback(pfnMsgCallback); + XGL_RESULT result = nextTable.DbgUnregisterMsgCallback(instance, pfnMsgCallback); return result; } @@ -1728,9 +1728,9 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetObjectTag(XGL_BASE_OBJECT object, si return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetGlobalOption(XGL_DBG_GLOBAL_OPTION dbgOption, size_t dataSize, const void* pData) +XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetGlobalOption(XGL_INSTANCE instance, XGL_DBG_GLOBAL_OPTION dbgOption, size_t dataSize, const void* pData) { - XGL_RESULT result = nextTable.DbgSetGlobalOption(dbgOption, dataSize, pData); + XGL_RESULT result = nextTable.DbgSetGlobalOption(instance, dbgOption, dataSize, pData); return result; } -- cgit v1.2.3