lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-23 06:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Access CaptureContext & RenderManager by reference, not pointer

Browse Source 
* Neither of these can or should be NULL so enforce it explicitly.
This commit is contained in:
baldurk
2017-02-09 19:28:24 +00:00
parent 0d141b6d7e
commit 2285b209c3
44 changed files with 762 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/EventBrowser.cpp
+13 -13
View File
@@ -40,12 +40,12 @@ enum
COL_LAST_EID,
};
EventBrowser::EventBrowser(CaptureContext *ctx, QWidget *parent)
EventBrowser::EventBrowser(CaptureContext &ctx, QWidget *parent)
: QFrame(parent), ui(new Ui::EventBrowser), m_Ctx(ctx)
{
ui->setupUi(this);
m_Ctx->AddLogViewer(this);
m_Ctx.AddLogViewer(this);
ui->events->header()->resizeSection(COL_EID, 45);
@@ -84,8 +84,8 @@ EventBrowser::EventBrowser(CaptureContext *ctx, QWidget *parent)
EventBrowser::~EventBrowser()
{
m_Ctx->windowClosed(this);
m_Ctx->RemoveLogViewer(this);
m_Ctx.windowClosed(this);
m_Ctx.RemoveLogViewer(this);
delete ui;
delete m_SizeDelegate;
}
@@ -94,7 +94,7 @@ void EventBrowser::OnLogfileLoaded()
{
QTreeWidgetItem *frame = new QTreeWidgetItem(
(QTreeWidget *)NULL,
QStringList{QString("Frame #%1").arg(m_Ctx->FrameInfo().frameNumber), "", ""});
QStringList{QString("Frame #%1").arg(m_Ctx.FrameInfo().frameNumber), "", ""});
QTreeWidgetItem *framestart = new QTreeWidgetItem(frame, QStringList{"Frame Start", "0", ""});
framestart->setData(COL_EID, Qt::UserRole, QVariant(0));
@@ -103,7 +103,7 @@ void EventBrowser::OnLogfileLoaded()
framestart->setData(COL_BOOKMARK, Qt::UserRole, QVariant(false));
framestart->setData(COL_LAST_EID, Qt::UserRole, QVariant(0));
uint lastEID = AddDrawcalls(frame, m_Ctx->CurDrawcalls());
uint lastEID = AddDrawcalls(frame, m_Ctx.CurDrawcalls());
frame->setData(COL_EID, Qt::UserRole, QVariant(0));
frame->setData(COL_LAST_EID, Qt::UserRole, QVariant(lastEID));
@@ -111,7 +111,7 @@ void EventBrowser::OnLogfileLoaded()
ui->events->expandItem(frame);
m_Ctx->SetEventID({this}, lastEID, lastEID);
m_Ctx.SetEventID({this}, lastEID, lastEID);
}
void EventBrowser::OnLogfileClosed()
@@ -220,7 +220,7 @@ void EventBrowser::on_toolButton_clicked()
void EventBrowser::on_timeDraws_clicked()
{
m_Ctx->Renderer()->AsyncInvoke([this](IReplayRenderer *r) {
m_Ctx.Renderer().AsyncInvoke([this](IReplayRenderer *r) {
uint32_t counters[] = {eCounter_EventGPUDuration};
@@ -249,7 +249,7 @@ void EventBrowser::on_events_currentItemChanged(QTreeWidgetItem *current, QTreeW
uint EID = current->data(COL_EID, Qt::UserRole).toUInt();
uint lastEID = current->data(COL_LAST_EID, Qt::UserRole).toUInt();
m_Ctx->SetEventID({this}, EID, lastEID);
m_Ctx.SetEventID({this}, EID, lastEID);
}
void EventBrowser::on_HideFindJump()
@@ -379,7 +379,7 @@ void EventBrowser::ExpandNode(QTreeWidgetItem *node)
bool EventBrowser::SelectEvent(uint32_t eventID)
{
if(!m_Ctx->LogLoaded())
if(!m_Ctx.LogLoaded())
return false;
QTreeWidgetItem *found = NULL;
@@ -413,7 +413,7 @@ void EventBrowser::ClearFindIcons(QTreeWidgetItem *parent)
void EventBrowser::ClearFindIcons()
{
if(m_Ctx->LogLoaded())
if(m_Ctx.LogLoaded())
ClearFindIcons(ui->events->topLevelItem(0));
}
@@ -507,7 +507,7 @@ int EventBrowser::FindEvent(QTreeWidgetItem *parent, QString filter, uint32_t af
int EventBrowser::FindEvent(QString filter, uint32_t after, bool forward)
{
if(!m_Ctx->LogLoaded())
if(!m_Ctx.LogLoaded())
return 0;
return FindEvent(ui->events->topLevelItem(0), filter, after, forward);
@@ -518,7 +518,7 @@ void EventBrowser::Find(bool forward)
if(ui->findEvent->text().isEmpty())
return;
uint32_t curEID = m_Ctx->CurEvent();
uint32_t curEID = m_Ctx.CurEvent();
if(!ui->events->selectedItems().isEmpty())
curEID = ui->events->selectedItems()[0]->data(COL_LAST_EID, Qt::UserRole).toUInt();