From e91634004f2a4e27cfa3f851fb7b7d21f2362266 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 4 Oct 2016 15:01:53 +0200 Subject: [PATCH] Rename Core to CaptureContext --- .../Code/{Core.cpp => CaptureContext.cpp} | 16 ++-- qrenderdoc/Code/{Core.h => CaptureContext.h} | 11 +-- qrenderdoc/Code/RenderManager.cpp | 2 +- qrenderdoc/Code/RenderManager.h | 7 +- qrenderdoc/Code/main.cpp | 4 +- qrenderdoc/Widgets/CustomPaintWidget.cpp | 4 +- qrenderdoc/Widgets/CustomPaintWidget.h | 8 +- qrenderdoc/Widgets/ResourcePreview.cpp | 2 +- qrenderdoc/Widgets/ResourcePreview.h | 4 +- qrenderdoc/Windows/EventBrowser.cpp | 28 +++--- qrenderdoc/Windows/EventBrowser.h | 6 +- qrenderdoc/Windows/MainWindow.cpp | 10 +-- qrenderdoc/Windows/MainWindow.h | 6 +- qrenderdoc/Windows/TextureViewer.cpp | 86 +++++++++---------- qrenderdoc/Windows/TextureViewer.h | 6 +- qrenderdoc/qrenderdoc_local.vcxproj | 6 +- qrenderdoc/qrenderdoc_local.vcxproj.filters | 18 ++-- 17 files changed, 110 insertions(+), 114 deletions(-) rename qrenderdoc/Code/{Core.cpp => CaptureContext.cpp} (91%) rename qrenderdoc/Code/{Core.h => CaptureContext.h} (97%) diff --git a/qrenderdoc/Code/Core.cpp b/qrenderdoc/Code/CaptureContext.cpp similarity index 91% rename from qrenderdoc/Code/Core.cpp rename to qrenderdoc/Code/CaptureContext.cpp index 49bc4dc54..a58459cc7 100644 --- a/qrenderdoc/Code/Core.cpp +++ b/qrenderdoc/Code/CaptureContext.cpp @@ -1,4 +1,4 @@ -#include "Core.h" +#include "CaptureContext.h" #include #include #include @@ -13,7 +13,8 @@ #include #endif -Core::Core(QString paramFilename, QString remoteHost, uint32_t remoteIdent, bool temp) +CaptureContext::CaptureContext(QString paramFilename, QString remoteHost, uint32_t remoteIdent, + bool temp) { m_LogLoaded = false; m_LoadInProgress = false; @@ -38,18 +39,19 @@ Core::Core(QString paramFilename, QString remoteHost, uint32_t remoteIdent, bool } } -Core::~Core() +CaptureContext::~CaptureContext() { m_Renderer.CloseThread(); delete m_MainWindow; } -void Core::LoadLogfile(QString logFile, bool temporary) +void CaptureContext::LoadLogfile(QString logFile, bool temporary) { LoadLogfile(-1, "", logFile, temporary); } -void Core::LoadLogfile(int proxyRenderer, QString replayHost, QString logFile, bool temporary) +void CaptureContext::LoadLogfile(int proxyRenderer, QString replayHost, QString logFile, + bool temporary) { m_LogFile = logFile; @@ -162,7 +164,7 @@ void Core::LoadLogfile(int proxyRenderer, QString replayHost, QString logFile, b m_LoadInProgress = false; } -void Core::SetEventID(ILogViewerForm *exclude, uint32_t eventID) +void CaptureContext::SetEventID(ILogViewerForm *exclude, uint32_t eventID) { m_EventID = eventID; @@ -183,7 +185,7 @@ void Core::SetEventID(ILogViewerForm *exclude, uint32_t eventID) } } -void *Core::FillWindowingData(WId widget) +void *CaptureContext::FillWindowingData(WId widget) { #if defined(WIN32) diff --git a/qrenderdoc/Code/Core.h b/qrenderdoc/Code/CaptureContext.h similarity index 97% rename from qrenderdoc/Code/Core.h rename to qrenderdoc/Code/CaptureContext.h index d16c1a26a..0842a46ea 100644 --- a/qrenderdoc/Code/Core.h +++ b/qrenderdoc/Code/CaptureContext.h @@ -1,5 +1,4 @@ -#ifndef CORE_H -#define CORE_H +#pragma once #include #include @@ -22,11 +21,11 @@ struct ILogLoadProgressListener class MainWindow; -class Core +class CaptureContext { public: - Core(QString paramFilename, QString remoteHost, uint32_t remoteIdent, bool temp); - ~Core(); + CaptureContext(QString paramFilename, QString remoteHost, uint32_t remoteIdent, bool temp); + ~CaptureContext(); ////////////////////////////////////////////////////////////////////////////// // Control functions @@ -229,5 +228,3 @@ public: return m_Size; } }; - -#endif // CORE_H diff --git a/qrenderdoc/Code/RenderManager.cpp b/qrenderdoc/Code/RenderManager.cpp index 1648426c3..37fd258df 100644 --- a/qrenderdoc/Code/RenderManager.cpp +++ b/qrenderdoc/Code/RenderManager.cpp @@ -1,6 +1,6 @@ #include "RenderManager.h" #include -#include "Core.h" +#include "CaptureContext.h" RenderManager::RenderManager() { diff --git a/qrenderdoc/Code/RenderManager.h b/qrenderdoc/Code/RenderManager.h index 7f731bebc..32a9f2370 100644 --- a/qrenderdoc/Code/RenderManager.h +++ b/qrenderdoc/Code/RenderManager.h @@ -1,5 +1,4 @@ -#ifndef RENDERMANAGER_H -#define RENDERMANAGER_H +#pragma once #include #include @@ -14,7 +13,7 @@ class LambdaThread; // simple helper for the common case of 'we just need to run this on the render thread #define INVOKE_MEMFN(function) \ - m_Core->Renderer()->AsyncInvoke([this](IReplayRenderer *) { function(); }); + m_Ctx->Renderer()->AsyncInvoke([this](IReplayRenderer *) { function(); }); class RenderManager { @@ -65,5 +64,3 @@ private: LambdaThread *m_Thread; ReplayCreateStatus m_CreateStatus; }; - -#endif // RENDERMANAGER_H diff --git a/qrenderdoc/Code/main.cpp b/qrenderdoc/Code/main.cpp index 4f08f724b..cb84e002d 100644 --- a/qrenderdoc/Code/main.cpp +++ b/qrenderdoc/Code/main.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "Code/Core.h" +#include "Code/CaptureContext.h" #include "Windows/MainWindow.h" int main(int argc, char *argv[]) @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv_mod); - Core core(filename, remoteHost, remoteIdent, temp); + CaptureContext ctx(filename, remoteHost, remoteIdent, temp); int ret = a.exec(); diff --git a/qrenderdoc/Widgets/CustomPaintWidget.cpp b/qrenderdoc/Widgets/CustomPaintWidget.cpp index d943ea422..8d4dd67b1 100644 --- a/qrenderdoc/Widgets/CustomPaintWidget.cpp +++ b/qrenderdoc/Widgets/CustomPaintWidget.cpp @@ -1,6 +1,6 @@ #include "CustomPaintWidget.h" #include -#include "Code/Core.h" +#include "Code/CaptureContext.h" #include "renderdoc_replay.h" CustomPaintWidget::CustomPaintWidget(QWidget *parent) : QWidget(parent) @@ -38,7 +38,7 @@ void CustomPaintWidget::paintEvent(QPaintEvent *e) { if(m_Output) { - m_Core->Renderer()->AsyncInvoke([this](IReplayRenderer *r) { m_Output->Display(); }); + m_Ctx->Renderer()->AsyncInvoke([this](IReplayRenderer *r) { m_Output->Display(); }); } else { diff --git a/qrenderdoc/Widgets/CustomPaintWidget.h b/qrenderdoc/Widgets/CustomPaintWidget.h index 2ff7184a3..4b13797c6 100644 --- a/qrenderdoc/Widgets/CustomPaintWidget.h +++ b/qrenderdoc/Widgets/CustomPaintWidget.h @@ -3,7 +3,7 @@ #include struct IReplayOutput; -class Core; +class CaptureContext; class CustomPaintWidget : public QWidget { @@ -13,9 +13,9 @@ public: explicit CustomPaintWidget(QWidget *parent = 0); ~CustomPaintWidget(); - void SetOutput(Core *c, IReplayOutput *out) + void SetOutput(CaptureContext *c, IReplayOutput *out) { - m_Core = c; + m_Ctx = c; m_Output = out; } signals: @@ -35,6 +35,6 @@ public slots: protected: void paintEvent(QPaintEvent *e); QPaintEngine *paintEngine() const { return NULL; } - Core *m_Core; + CaptureContext *m_Ctx; IReplayOutput *m_Output; }; diff --git a/qrenderdoc/Widgets/ResourcePreview.cpp b/qrenderdoc/Widgets/ResourcePreview.cpp index 1835ce6bd..b68b1ea8b 100644 --- a/qrenderdoc/Widgets/ResourcePreview.cpp +++ b/qrenderdoc/Widgets/ResourcePreview.cpp @@ -1,7 +1,7 @@ #include "ResourcePreview.h" #include "ui_ResourcePreview.h" -ResourcePreview::ResourcePreview(Core *c, IReplayOutput *output, QWidget *parent) +ResourcePreview::ResourcePreview(CaptureContext *c, IReplayOutput *output, QWidget *parent) : QFrame(parent), ui(new Ui::ResourcePreview) { ui->setupUi(this); diff --git a/qrenderdoc/Widgets/ResourcePreview.h b/qrenderdoc/Widgets/ResourcePreview.h index 683d7d869..8f3946c64 100644 --- a/qrenderdoc/Widgets/ResourcePreview.h +++ b/qrenderdoc/Widgets/ResourcePreview.h @@ -9,14 +9,14 @@ class ResourcePreview; } struct IReplayOutput; -class Core; +class CaptureContext; class ResourcePreview : public QFrame { Q_OBJECT public: - explicit ResourcePreview(Core *c, IReplayOutput *output, QWidget *parent = 0); + explicit ResourcePreview(CaptureContext *c, IReplayOutput *output, QWidget *parent = 0); ~ResourcePreview(); void setSlotName(const QString &n); diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp index d91726ca0..83d2d21c5 100644 --- a/qrenderdoc/Windows/EventBrowser.cpp +++ b/qrenderdoc/Windows/EventBrowser.cpp @@ -1,6 +1,6 @@ #include "EventBrowser.h" #include -#include "Code/Core.h" +#include "Code/CaptureContext.h" #include "ui_EventBrowser.h" enum @@ -15,12 +15,12 @@ enum COL_SELECT_EID, }; -EventBrowser::EventBrowser(Core *core, QWidget *parent) - : QFrame(parent), ui(new Ui::EventBrowser), m_Core(core) +EventBrowser::EventBrowser(CaptureContext *ctx, QWidget *parent) + : QFrame(parent), ui(new Ui::EventBrowser), m_Ctx(ctx) { ui->setupUi(this); - m_Core->AddLogViewer(this); + m_Ctx->AddLogViewer(this); ui->events->header()->resizeSection(COL_EID, 45); @@ -61,7 +61,7 @@ EventBrowser::EventBrowser(Core *core, QWidget *parent) EventBrowser::~EventBrowser() { - m_Core->RemoveLogViewer(this); + m_Ctx->RemoveLogViewer(this); delete ui; delete m_SizeDelegate; } @@ -70,7 +70,7 @@ void EventBrowser::OnLogfileLoaded() { QTreeWidgetItem *frame = new QTreeWidgetItem( (QTreeWidget *)NULL, - QStringList{QString("Frame #%1").arg(m_Core->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)); @@ -79,7 +79,7 @@ void EventBrowser::OnLogfileLoaded() framestart->setData(COL_BOOKMARK, Qt::UserRole, QVariant(false)); framestart->setData(COL_SELECT_EID, Qt::UserRole, QVariant(0)); - uint lastEID = AddDrawcalls(frame, m_Core->CurDrawcalls()); + uint lastEID = AddDrawcalls(frame, m_Ctx->CurDrawcalls()); frame->setData(COL_EID, Qt::UserRole, QVariant(lastEID)); frame->setData(COL_SELECT_EID, Qt::UserRole, QVariant(lastEID)); @@ -87,7 +87,7 @@ void EventBrowser::OnLogfileLoaded() ui->events->expandItem(frame); - m_Core->SetEventID(this, lastEID); + m_Ctx->SetEventID(this, lastEID); } void EventBrowser::OnLogfileClosed() @@ -197,7 +197,7 @@ void EventBrowser::on_toolButton_clicked() void EventBrowser::on_timeDraws_clicked() { - m_Core->Renderer()->AsyncInvoke([this](IReplayRenderer *r) { + m_Ctx->Renderer()->AsyncInvoke([this](IReplayRenderer *r) { uint32_t counters[] = {eCounter_EventGPUDuration}; @@ -225,7 +225,7 @@ void EventBrowser::on_events_currentItemChanged(QTreeWidgetItem *current, QTreeW uint EID = current->data(COL_SELECT_EID, Qt::UserRole).toUInt(); - m_Core->SetEventID(this, EID); + m_Ctx->SetEventID(this, EID); } void EventBrowser::on_HideFindJump() @@ -355,7 +355,7 @@ void EventBrowser::ExpandNode(QTreeWidgetItem *node) bool EventBrowser::SelectEvent(uint32_t eventID) { - if(!m_Core->LogLoaded()) + if(!m_Ctx->LogLoaded()) return false; QTreeWidgetItem *found = NULL; @@ -389,7 +389,7 @@ void EventBrowser::ClearFindIcons(QTreeWidgetItem *parent) void EventBrowser::ClearFindIcons() { - if(m_Core->LogLoaded()) + if(m_Ctx->LogLoaded()) ClearFindIcons(ui->events->topLevelItem(0)); } @@ -483,7 +483,7 @@ int EventBrowser::FindEvent(QTreeWidgetItem *parent, QString filter, uint32_t af int EventBrowser::FindEvent(QString filter, uint32_t after, bool forward) { - if(!m_Core->LogLoaded()) + if(!m_Ctx->LogLoaded()) return 0; return FindEvent(ui->events->topLevelItem(0), filter, after, forward); @@ -494,7 +494,7 @@ void EventBrowser::Find(bool forward) if(ui->findEvent->text().isEmpty()) return; - uint32_t curEID = m_Core->CurEvent(); + uint32_t curEID = m_Ctx->CurEvent(); if(!ui->events->selectedItems().isEmpty()) curEID = ui->events->selectedItems()[0]->data(COL_SELECT_EID, Qt::UserRole).toUInt(); diff --git a/qrenderdoc/Windows/EventBrowser.h b/qrenderdoc/Windows/EventBrowser.h index 5d0194458..c9252d108 100644 --- a/qrenderdoc/Windows/EventBrowser.h +++ b/qrenderdoc/Windows/EventBrowser.h @@ -3,7 +3,7 @@ #include #include -#include "Code/Core.h" +#include "Code/CaptureContext.h" namespace Ui { @@ -19,7 +19,7 @@ private: Q_OBJECT public: - explicit EventBrowser(Core *core, QWidget *parent = 0); + explicit EventBrowser(CaptureContext *ctx, QWidget *parent = 0); ~EventBrowser(); void OnLogfileLoaded(); @@ -81,7 +81,7 @@ private: void RefreshIcon(QTreeWidgetItem *item); Ui::EventBrowser *ui; - Core *m_Core; + CaptureContext *m_Ctx; }; #endif // EVENTBROWSER_H diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp index fc4c0ac73..6b2521b26 100644 --- a/qrenderdoc/Windows/MainWindow.cpp +++ b/qrenderdoc/Windows/MainWindow.cpp @@ -1,21 +1,21 @@ #include "MainWindow.h" #include #include -#include "Code/Core.h" +#include "Code/CaptureContext.h" #include "Windows/AboutDialog.h" #include "EventBrowser.h" #include "TextureViewer.h" #include "ui_MainWindow.h" -MainWindow::MainWindow(Core *core) : QMainWindow(NULL), ui(new Ui::MainWindow), m_Core(core) +MainWindow::MainWindow(CaptureContext *ctx) : QMainWindow(NULL), ui(new Ui::MainWindow), m_Ctx(ctx) { ui->setupUi(this); - EventBrowser *eventbrowser = new EventBrowser(core); + EventBrowser *eventbrowser = new EventBrowser(ctx); ui->toolWindowManager->addToolWindow(eventbrowser, ToolWindowManager::EmptySpace); - TextureViewer *textureviewer = new TextureViewer(core); + TextureViewer *textureviewer = new TextureViewer(ctx); ui->toolWindowManager->addToolWindow( textureviewer, @@ -46,7 +46,7 @@ void MainWindow::on_action_Open_Log_triggered() if(filename != "" && checkFile.exists() && checkFile.isFile()) { LambdaThread *thread = - new LambdaThread([filename, this]() { m_Core->LoadLogfile(filename, false); }); + new LambdaThread([filename, this]() { m_Ctx->LoadLogfile(filename, false); }); thread->start(); } } diff --git a/qrenderdoc/Windows/MainWindow.h b/qrenderdoc/Windows/MainWindow.h index fef001879..4a37de177 100644 --- a/qrenderdoc/Windows/MainWindow.h +++ b/qrenderdoc/Windows/MainWindow.h @@ -9,7 +9,7 @@ namespace Ui class MainWindow; } -class Core; +class CaptureContext; class MainWindow : public QMainWindow { @@ -17,7 +17,7 @@ private: Q_OBJECT public: - explicit MainWindow(Core *core); + explicit MainWindow(CaptureContext *ctx); ~MainWindow(); private slots: @@ -27,7 +27,7 @@ private slots: private: Ui::MainWindow *ui; - Core *m_Core; + CaptureContext *m_Ctx; }; #endif // MAINWINDOW_H diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp index c2321950c..1d6e2e49f 100644 --- a/qrenderdoc/Windows/TextureViewer.cpp +++ b/qrenderdoc/Windows/TextureViewer.cpp @@ -1,7 +1,7 @@ #include "TextureViewer.h" #include -#include "Code/Core.h" +#include "Code/CaptureContext.h" #include "Widgets/ResourcePreview.h" #include "FlowLayout.h" #include "ui_TextureViewer.h" @@ -15,15 +15,15 @@ struct Formatter static QString Format(int32_t i) { return QString::number(i); } }; -TextureViewer::TextureViewer(Core *core, QWidget *parent) - : QFrame(parent), ui(new Ui::TextureViewer), m_Core(core) +TextureViewer::TextureViewer(CaptureContext *ctx, QWidget *parent) + : QFrame(parent), ui(new Ui::TextureViewer), m_Ctx(ctx) { ui->setupUi(this); - m_Core->AddLogViewer(this); + m_Ctx->AddLogViewer(this); - ui->render->SetOutput(m_Core, NULL); - ui->pixelContext->SetOutput(m_Core, NULL); + ui->render->SetOutput(m_Ctx, NULL); + ui->pixelContext->SetOutput(m_Ctx, NULL); memset(&m_TexDisplay, 0, sizeof(m_TexDisplay)); m_TexDisplay.sampleIdx = ~0U; @@ -195,7 +195,7 @@ TextureViewer::TextureViewer(Core *core, QWidget *parent) TextureViewer::~TextureViewer() { - m_Core->RemoveLogViewer(this); + m_Ctx->RemoveLogViewer(this); delete ui; } @@ -260,7 +260,7 @@ void TextureViewer::RT_UpdateAndDisplay() void TextureViewer::UI_UpdateStatusText() { - FetchTexture *texptr = m_Core->GetTexture(m_TexDisplay.texid); + FetchTexture *texptr = m_Ctx->GetTexture(m_TexDisplay.texid); if(texptr == NULL) return; @@ -315,7 +315,7 @@ void TextureViewer::UI_UpdateStatusText() uint mipWidth = qMax(1U, tex.width >> (int)m_TexDisplay.mip); uint mipHeight = qMax(1U, tex.height >> (int)m_TexDisplay.mip); - if(m_Core->APIProps().pipelineType == eGraphicsAPI_OpenGL) + if(m_Ctx->APIProps().pipelineType == eGraphicsAPI_OpenGL) y = (int)(mipHeight - 1) - y; if(m_TexDisplay.FlipY) y = (int)(mipHeight - 1) - y; @@ -344,7 +344,7 @@ void TextureViewer::UI_UpdateStatusText() { x = m_PickedPoint.x() >> (int)m_TexDisplay.mip; y = m_PickedPoint.y() >> (int)m_TexDisplay.mip; - if(m_Core->APIProps().pipelineType == eGraphicsAPI_OpenGL) + if(m_Ctx->APIProps().pipelineType == eGraphicsAPI_OpenGL) y = (int)(mipHeight - 1) - y; if(m_TexDisplay.FlipY) y = (int)(mipHeight - 1) - y; @@ -418,7 +418,7 @@ void TextureViewer::UI_UpdateStatusText() if(m_Output != NULL) { - m_Core->Renderer()->AsyncInvoke([this](IReplayRenderer *) { m_Output->DisablePixelContext(); }); + m_Ctx->Renderer()->AsyncInvoke([this](IReplayRenderer *) { m_Output->DisablePixelContext(); }); } // PixelPicked = false; @@ -441,7 +441,7 @@ void TextureViewer::UI_UpdateTextureDetails() { QString status; - FetchTexture *texptr = m_Core->GetTexture(m_TexDisplay.texid); + FetchTexture *texptr = m_Ctx->GetTexture(m_TexDisplay.texid); if(texptr == NULL) { ui->texStatusDim->setText(status); @@ -455,14 +455,14 @@ void TextureViewer::UI_UpdateTextureDetails() #if 1 ui->renderContainer->setWindowTitle(tr(current.name.elems)); #else - ResourceId followID = m_Following.GetResourceId(m_Core); + ResourceId followID = m_Following.GetResourceId(m_Ctx); { bool found = false; string name = ""; - foreach(var t in m_Core.CurTextures) + foreach(var t in m_Ctx.CurTextures) { if(t.ID == followID) { @@ -471,7 +471,7 @@ void TextureViewer::UI_UpdateTextureDetails() } } - foreach(var b in m_Core.CurBuffers) + foreach(var b in m_Ctx.CurBuffers) { if(b.ID == followID) { @@ -548,7 +548,7 @@ void TextureViewer::UI_UpdateTextureDetails() void TextureViewer::UI_OnTextureSelectionChanged(bool newdraw) { - FetchTexture *texptr = m_Core->GetTexture(m_TexDisplay.texid); + FetchTexture *texptr = m_Ctx->GetTexture(m_TexDisplay.texid); // reset high-water mark m_HighWaterStatusLength = 0; @@ -602,7 +602,7 @@ void TextureViewer::UI_OnTextureSelectionChanged(bool newdraw) // only switch to the selected mip for outputs, and when changing drawcall /* if (!CurrentTextureIsLocked && m_Following.Type != FollowType.ReadOnly && newdraw) - highestMip = m_Following.GetHighestMip(m_Core); + highestMip = m_Following.GetHighestMip(m_Ctx); */ // assuming we get a valid mip for the highest mip, only switch to it @@ -666,7 +666,7 @@ void TextureViewer::UI_OnTextureSelectionChanged(bool newdraw) // only switch to the selected mip for outputs, and when changing drawcall /* if (!CurrentTextureIsLocked && m_Following.Type != FollowType.ReadOnly && newdraw) - firstArraySlice = m_Following.GetFirstArraySlice(m_Core); + firstArraySlice = m_Following.GetFirstArraySlice(m_Ctx); */ // see above with highestMip and prevHighestMip for the logic behind this @@ -686,7 +686,7 @@ void TextureViewer::UI_OnTextureSelectionChanged(bool newdraw) UI_UpdateTextureDetails(); UI_UpdateChannels(); - m_Core->Renderer()->AsyncInvoke([this](IReplayRenderer *) { + m_Ctx->Renderer()->AsyncInvoke([this](IReplayRenderer *) { // RT_UpdateVisualRange(r); RT_UpdateAndDisplay(); @@ -700,7 +700,7 @@ void TextureViewer::UI_OnTextureSelectionChanged(bool newdraw) void TextureViewer::UI_UpdateChannels() { - FetchTexture *tex = m_Core->GetTexture(m_TexDisplay.texid); + FetchTexture *tex = m_Ctx->GetTexture(m_TexDisplay.texid); #define SHOW(widget) widget->setVisible(true) #define HIDE(widget) widget->setVisible(false) @@ -775,7 +775,7 @@ void TextureViewer::UI_UpdateChannels() } m_TexDisplay.CustomShader = ResourceId(); } - else if(ui->channels->currentIndex() == 0 || !m_Core->LogLoaded()) + else if(ui->channels->currentIndex() == 0 || !m_Ctx->LogLoaded()) { // RGBA SHOW(ui->channelRed); @@ -923,7 +923,7 @@ void TextureViewer::render_mouseMove(QMouseEvent *e) if(m_TexDisplay.texid != ResourceId()) { - FetchTexture *texptr = m_Core->GetTexture(m_TexDisplay.texid); + FetchTexture *texptr = m_Ctx->GetTexture(m_TexDisplay.texid); if(texptr != NULL) { @@ -993,7 +993,7 @@ void TextureViewer::render_resize(QResizeEvent *e) float TextureViewer::CurMaxScrollX() { - FetchTexture *texptr = m_Core->GetTexture(m_TexDisplay.texid); + FetchTexture *texptr = m_Ctx->GetTexture(m_TexDisplay.texid); QSizeF size(1.0f, 1.0f); @@ -1005,7 +1005,7 @@ float TextureViewer::CurMaxScrollX() float TextureViewer::CurMaxScrollY() { - FetchTexture *texptr = m_Core->GetTexture(m_TexDisplay.texid); + FetchTexture *texptr = m_Ctx->GetTexture(m_TexDisplay.texid); QSizeF size(1.0f, 1.0f); @@ -1042,7 +1042,7 @@ void TextureViewer::setScrollPosition(const QPoint &pos) void TextureViewer::UI_CalcScrollbars() { - FetchTexture *texptr = m_Core->GetTexture(m_TexDisplay.texid); + FetchTexture *texptr = m_Ctx->GetTexture(m_TexDisplay.texid); QSizeF size(1.0f, 1.0f); @@ -1107,13 +1107,13 @@ void TextureViewer::OnLogfileLoaded() WId renderID = ui->render->winId(); WId contextID = ui->pixelContext->winId(); - m_Core->Renderer()->BlockInvoke([renderID, contextID, this](IReplayRenderer *r) { - m_Output = r->CreateOutput(m_Core->m_CurWinSystem, m_Core->FillWindowingData(renderID), + m_Ctx->Renderer()->BlockInvoke([renderID, contextID, this](IReplayRenderer *r) { + m_Output = r->CreateOutput(m_Ctx->m_CurWinSystem, m_Ctx->FillWindowingData(renderID), eOutputType_TexDisplay); - m_Output->SetPixelContext(m_Core->m_CurWinSystem, m_Core->FillWindowingData(contextID)); + m_Output->SetPixelContext(m_Ctx->m_CurWinSystem, m_Ctx->FillWindowingData(contextID)); - ui->render->SetOutput(m_Core, m_Output); + ui->render->SetOutput(m_Ctx, m_Output); OutputConfig c = {eOutputType_TexDisplay}; m_Output->SetOutputConfig(c); @@ -1123,7 +1123,7 @@ void TextureViewer::OnLogfileLoaded() void TextureViewer::OnLogfileClosed() { m_Output = NULL; - ui->render->SetOutput(m_Core, NULL); + ui->render->SetOutput(m_Ctx, NULL); UI_UpdateTextureDetails(); } @@ -1139,23 +1139,23 @@ void TextureViewer::OnEventSelected(uint32_t eventID) // hack to select texture until we have thumbnails & following TextureDisplay &d = m_TexDisplay; - if(m_Core->APIProps().pipelineType == eGraphicsAPI_D3D11) + if(m_Ctx->APIProps().pipelineType == eGraphicsAPI_D3D11) { - d.texid = m_Core->CurD3D11PipelineState.m_OM.RenderTargets[0].Resource; + d.texid = m_Ctx->CurD3D11PipelineState.m_OM.RenderTargets[0].Resource; if(d.texid == ResourceId()) - d.texid = m_Core->CurD3D11PipelineState.m_OM.DepthTarget.Resource; + d.texid = m_Ctx->CurD3D11PipelineState.m_OM.DepthTarget.Resource; } - else if(m_Core->APIProps().pipelineType == eGraphicsAPI_OpenGL) + else if(m_Ctx->APIProps().pipelineType == eGraphicsAPI_OpenGL) { - d.texid = m_Core->CurGLPipelineState.m_FB.m_DrawFBO.Color[0].Obj; + d.texid = m_Ctx->CurGLPipelineState.m_FB.m_DrawFBO.Color[0].Obj; if(d.texid == ResourceId()) - d.texid = m_Core->CurGLPipelineState.m_FB.m_DrawFBO.Depth.Obj; + d.texid = m_Ctx->CurGLPipelineState.m_FB.m_DrawFBO.Depth.Obj; } else { - const VulkanPipelineState &pipe = m_Core->CurVulkanPipelineState; + const VulkanPipelineState &pipe = m_Ctx->CurVulkanPipelineState; if(pipe.Pass.renderpass.colorAttachments.count > 0) d.texid = pipe.Pass.framebuffer.attachments[pipe.Pass.renderpass.colorAttachments[0]].img; @@ -1164,7 +1164,7 @@ void TextureViewer::OnEventSelected(uint32_t eventID) if(d.texid == ResourceId()) { - const FetchDrawcall *draw = m_Core->CurDrawcall(); + const FetchDrawcall *draw = m_Ctx->CurDrawcall(); if(draw) d.texid = draw->copyDestination; } @@ -1175,7 +1175,7 @@ void TextureViewer::OnEventSelected(uint32_t eventID) float TextureViewer::GetFitScale() { - FetchTexture *texptr = m_Core->GetTexture(m_TexDisplay.texid); + FetchTexture *texptr = m_Ctx->GetTexture(m_TexDisplay.texid); if(texptr == NULL) return 1.0f; @@ -1353,7 +1353,7 @@ void TextureViewer::on_checkerBack_clicked() void TextureViewer::on_mipLevel_currentIndexChanged(int index) { - FetchTexture *texptr = m_Core->GetTexture(m_TexDisplay.texid); + FetchTexture *texptr = m_Ctx->GetTexture(m_TexDisplay.texid); if(texptr == NULL) return; @@ -1396,7 +1396,7 @@ void TextureViewer::on_mipLevel_currentIndexChanged(int index) if(m_Output != NULL && m_PickedPoint.x() >= 0 && m_PickedPoint.y() >= 0) { - m_Core->Renderer()->AsyncInvoke([this](IReplayRenderer *) { + m_Ctx->Renderer()->AsyncInvoke([this](IReplayRenderer *) { if(m_Output != NULL) RT_PickPixelsAndUpdate(); }); @@ -1407,7 +1407,7 @@ void TextureViewer::on_mipLevel_currentIndexChanged(int index) void TextureViewer::on_sliceFace_currentIndexChanged(int index) { - FetchTexture *texptr = m_Core->GetTexture(m_TexDisplay.texid); + FetchTexture *texptr = m_Ctx->GetTexture(m_TexDisplay.texid); if(texptr == NULL) return; @@ -1421,7 +1421,7 @@ void TextureViewer::on_sliceFace_currentIndexChanged(int index) if(m_Output != NULL && m_PickedPoint.x() >= 0 && m_PickedPoint.y() >= 0) { - m_Core->Renderer()->AsyncInvoke([this](IReplayRenderer *) { + m_Ctx->Renderer()->AsyncInvoke([this](IReplayRenderer *) { if(m_Output != NULL) RT_PickPixelsAndUpdate(); }); diff --git a/qrenderdoc/Windows/TextureViewer.h b/qrenderdoc/Windows/TextureViewer.h index dff548d48..481acf65c 100644 --- a/qrenderdoc/Windows/TextureViewer.h +++ b/qrenderdoc/Windows/TextureViewer.h @@ -3,7 +3,7 @@ #include #include -#include "Code/Core.h" +#include "Code/CaptureContext.h" namespace Ui { @@ -16,7 +16,7 @@ private: Q_OBJECT public: - explicit TextureViewer(Core *core, QWidget *parent = 0); + explicit TextureViewer(CaptureContext *ctx, QWidget *parent = 0); ~TextureViewer(); void OnLogfileLoaded(); @@ -99,7 +99,7 @@ private: int m_PrevHighestMip = -1; Ui::TextureViewer *ui; - Core *m_Core = NULL; + CaptureContext *m_Ctx = NULL; IReplayOutput *m_Output = NULL; TextureDisplay m_TexDisplay; diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj index e89b44d1f..eb3f36679 100644 --- a/qrenderdoc/qrenderdoc_local.vcxproj +++ b/qrenderdoc/qrenderdoc_local.vcxproj @@ -277,7 +277,7 @@ - + @@ -294,7 +294,7 @@ - + @@ -326,7 +326,7 @@ - + diff --git a/qrenderdoc/qrenderdoc_local.vcxproj.filters b/qrenderdoc/qrenderdoc_local.vcxproj.filters index e22b0a2d2..5f9c58b3a 100644 --- a/qrenderdoc/qrenderdoc_local.vcxproj.filters +++ b/qrenderdoc/qrenderdoc_local.vcxproj.filters @@ -67,9 +67,6 @@ Generated Files - - Generated Files - Generated Files @@ -85,9 +82,6 @@ 3rdparty\FlowLayout - - Code - Code @@ -130,6 +124,12 @@ Generated Files + + Code + + + Generated Files + @@ -141,9 +141,6 @@ Windows\Dialogs - - Code - Widgets @@ -183,6 +180,9 @@ Generated Files + + Code +