From: Peter Lohrmann Date: Thu, 13 Mar 2014 20:06:34 +0000 (-0700) Subject: UI: Add 'GL Context' column to API call tree to help with multi-context debugging. X-Git-Url: https://git.cworth.org/git?p=vogl;a=commitdiff_plain;h=16fc4b597a57c1a1ba5972843587f2b620e8c2ff UI: Add 'GL Context' column to API call tree to help with multi-context debugging. (cherry picked from commit 39e0f793e3588b12e0444241b9b4a2859bc8b18f) --- diff --git a/src/vogleditor/vogleditor_apicalltreeitem.cpp b/src/vogleditor/vogleditor_apicalltreeitem.cpp index 5a66db8..32ff10a 100644 --- a/src/vogleditor/vogleditor_apicalltreeitem.cpp +++ b/src/vogleditor/vogleditor_apicalltreeitem.cpp @@ -40,6 +40,7 @@ vogleditor_apiCallTreeItem::vogleditor_apiCallTreeItem(vogleditor_QApiCallTreeMo m_columnData[VOGL_ACTC_APICALL] = "API Call"; m_columnData[VOGL_ACTC_INDEX] = "Index"; m_columnData[VOGL_ACTC_FLAGS] = ""; + m_columnData[VOGL_ACTC_GLCONTEXT] = "GL Context"; //m_ColumnTitles[VOGL_ACTC_BEGINTIME] = "Begin Time"; //m_ColumnTitles[VOGL_ACTC_ENDTIME] = "End Time"; m_columnData[VOGL_ACTC_DURATION] = "Duration (ns)"; @@ -78,6 +79,8 @@ vogleditor_apiCallTreeItem::vogleditor_apiCallTreeItem(QString nodeText, vogledi { m_columnData[VOGL_ACTC_INDEX] = (qulonglong)apiCallItem->globalCallIndex(); m_columnData[VOGL_ACTC_FLAGS] = ""; + dynamic_string strContext; + m_columnData[VOGL_ACTC_GLCONTEXT] = strContext.format("0x%" PRIx64, apiCallItem->getGLPacket()->m_context_handle).c_str(); //m_columnData[VOGL_ACTC_BEGINTIME] = apiCallItem->startTime(); //m_columnData[VOGL_ACTC_ENDTIME] = apiCallItem->endTime(); m_columnData[VOGL_ACTC_DURATION] = (qulonglong)apiCallItem->duration(); diff --git a/src/vogleditor/vogleditor_apicalltreeitem.h b/src/vogleditor/vogleditor_apicalltreeitem.h index 2f94f9b..9957a72 100644 --- a/src/vogleditor/vogleditor_apicalltreeitem.h +++ b/src/vogleditor/vogleditor_apicalltreeitem.h @@ -40,6 +40,7 @@ enum VOGL_API_CALL_TREE_COLUMN { VOGL_ACTC_APICALL, VOGL_ACTC_INDEX, + VOGL_ACTC_GLCONTEXT, VOGL_ACTC_FLAGS, // VOGL_ACTC_BEGINTIME, // VOGL_ACTC_ENDTIME,