From f9763992ee2e4b80fefa9cd60cf1f22ad83e5ef9 Mon Sep 17 00:00:00 2001 From: Cory Bloor Date: Thu, 14 Apr 2016 22:14:00 -0600 Subject: [PATCH 1/5] Relax size constraints on mul entry box The given fixed size is far too small. Removing the maximum size and allowing it adjust to its preferred size should fix this problem. --- qrenderdoc/Windows/TextureViewer.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui index 751d6c625..9d0255028 100644 --- a/qrenderdoc/Windows/TextureViewer.ui +++ b/qrenderdoc/Windows/TextureViewer.ui @@ -608,7 +608,7 @@ - + 0 0 @@ -621,7 +621,7 @@ - 50 + 16777215 16777215 From 068e38f8f38cf0618d1d191b3f383cbb842bac79 Mon Sep 17 00:00:00 2001 From: Cory Bloor Date: Sun, 17 Apr 2016 02:38:35 -0600 Subject: [PATCH 2/5] Fix memory leak in thumbnail size check --- renderdoc/replay/entry_points.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/renderdoc/replay/entry_points.cpp b/renderdoc/replay/entry_points.cpp index ba3be463c..7fff1b00c 100644 --- a/renderdoc/replay/entry_points.cpp +++ b/renderdoc/replay/entry_points.cpp @@ -379,6 +379,7 @@ bool32 RENDERDOC_CC RENDERDOC_GetThumbnail(const char *filename, byte *buf, uint if(buf == NULL) { len = (uint32_t)thumblen; + delete[] jpgbuf; return true; } From 0093fdb31d466e55442ae8c8510d51839235e41f Mon Sep 17 00:00:00 2001 From: Cory Bloor Date: Sun, 17 Apr 2016 04:46:45 -0600 Subject: [PATCH 3/5] Add GetVersionString to RenderDoc API --- renderdoc/api/replay/renderdoc_replay.h | 1 + renderdoc/replay/entry_points.cpp | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/renderdoc/api/replay/renderdoc_replay.h b/renderdoc/api/replay/renderdoc_replay.h index e1d6ed7c7..859a408dc 100644 --- a/renderdoc/api/replay/renderdoc_replay.h +++ b/renderdoc/api/replay/renderdoc_replay.h @@ -431,3 +431,4 @@ extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_InjectIntoProcess(uint3 extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_TriggerExceptionHandler(void *exceptionPtrs, bool32 crashed); extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_LogText(const char *text); extern "C" RENDERDOC_API bool32 RENDERDOC_CC RENDERDOC_GetThumbnail(const char *filename, byte *buf, uint32_t &len); +extern "C" RENDERDOC_API const char* RENDERDOC_CC RENDERDOC_GetVersionString(); diff --git a/renderdoc/replay/entry_points.cpp b/renderdoc/replay/entry_points.cpp index 7fff1b00c..151b90b2e 100644 --- a/renderdoc/replay/entry_points.cpp +++ b/renderdoc/replay/entry_points.cpp @@ -30,6 +30,7 @@ #include "core/core.h" #include "replay/replay_renderer.h" #include "api/replay/renderdoc_replay.h" +#include "data/version.h" // these entry points are for the replay/analysis side - not for the application. @@ -235,6 +236,12 @@ extern "C" RENDERDOC_API void RENDERDOC_CC Camera_GetBasis(Camera *c, FloatVecto up->z = u.z; } +extern "C" RENDERDOC_API +const char* RENDERDOC_CC RENDERDOC_GetVersionString() +{ + return RENDERDOC_VERSION_STRING; +} + extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_LogText(const char *text) { From 45a0f6213976dd57f83d50939d9bb6934a122571 Mon Sep 17 00:00:00 2001 From: Cory Bloor Date: Sun, 17 Apr 2016 04:46:17 -0600 Subject: [PATCH 4/5] Add about dialog to qrenderdoc --- qrenderdoc/Code/Core.cpp | 2 + qrenderdoc/Windows/AboutDialog.cpp | 19 +++++ qrenderdoc/Windows/AboutDialog.h | 21 +++++ qrenderdoc/Windows/AboutDialog.ui | 126 +++++++++++++++++++++++++++++ qrenderdoc/Windows/MainWindow.cpp | 7 ++ qrenderdoc/Windows/MainWindow.h | 2 +- qrenderdoc/qrenderdoc.pro | 5 +- 7 files changed, 180 insertions(+), 2 deletions(-) create mode 100644 qrenderdoc/Windows/AboutDialog.cpp create mode 100644 qrenderdoc/Windows/AboutDialog.h create mode 100644 qrenderdoc/Windows/AboutDialog.ui diff --git a/qrenderdoc/Code/Core.cpp b/qrenderdoc/Code/Core.cpp index 14d36b962..94e83d3b4 100644 --- a/qrenderdoc/Code/Core.cpp +++ b/qrenderdoc/Code/Core.cpp @@ -15,6 +15,8 @@ Core::Core(QString paramFilename, QString remoteHost, uint32_t remoteIdent, bool memset(&m_APIProps, 0, sizeof(m_APIProps)); + qApp->setApplicationVersion(RENDERDOC_GetVersionString()); + m_MainWindow = new MainWindow(this); m_MainWindow->show(); diff --git a/qrenderdoc/Windows/AboutDialog.cpp b/qrenderdoc/Windows/AboutDialog.cpp new file mode 100644 index 000000000..eaa158af0 --- /dev/null +++ b/qrenderdoc/Windows/AboutDialog.cpp @@ -0,0 +1,19 @@ +#include "AboutDialog.h" +#include "ui_AboutDialog.h" + +#include +#include +#include + +AboutDialog::AboutDialog(QWidget *parent) + : QDialog(parent) + , ui(new Ui::AboutDialog) +{ + ui->setupUi(this); + ui->version->setText("Version v" + qApp->applicationVersion()); +} + +AboutDialog::~AboutDialog() +{ + delete ui; +} diff --git a/qrenderdoc/Windows/AboutDialog.h b/qrenderdoc/Windows/AboutDialog.h new file mode 100644 index 000000000..e6a0f35c4 --- /dev/null +++ b/qrenderdoc/Windows/AboutDialog.h @@ -0,0 +1,21 @@ +#ifndef ABOUTDIALOG_H +#define ABOUTDIALOG_H + +#include + +namespace Ui { + class AboutDialog; +} + +class AboutDialog : public QDialog +{ + Q_OBJECT +public: + explicit AboutDialog(QWidget *parent = 0); + ~AboutDialog(); + +private: + Ui::AboutDialog *ui; +}; + +#endif diff --git a/qrenderdoc/Windows/AboutDialog.ui b/qrenderdoc/Windows/AboutDialog.ui new file mode 100644 index 000000000..0b01acb98 --- /dev/null +++ b/qrenderdoc/Windows/AboutDialog.ui @@ -0,0 +1,126 @@ + + + AboutDialog + + + + 0 + 0 + 518 + 302 + + + + About RenderDoc + + + + QLayout::SetFixedSize + + + + + + + + :/Resources/128.png + + + + + + + Version v0.00 + + + + + + + Baldur Karsson + + + + + + + <a href='mailto:baldurk@baldurk.org'>baldurk@baldurk.org</a> + + + Qt::RichText + + + true + + + + + + + <a href='https://github.com/baldurk/renderdoc'>https://github.com/baldurk/renderdoc</a> + + + Qt::RichText + + + true + + + + + + + Copyright Baldur Karlsson 2016 + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Close + + + + + + + + + + + buttonBox + accepted() + AboutDialog + accept() + + + 20 + 20 + + + 20 + 20 + + + + + buttonBox + rejected() + AboutDialog + reject() + + + 20 + 20 + + + 20 + 20 + + + + + diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp index e5a217beb..787d049ef 100644 --- a/qrenderdoc/Windows/MainWindow.cpp +++ b/qrenderdoc/Windows/MainWindow.cpp @@ -1,4 +1,5 @@ #include "MainWindow.h" +#include "Windows/AboutDialog.h" #include "EventBrowser.h" #include "TextureViewer.h" #include "ui_MainWindow.h" @@ -52,3 +53,9 @@ void MainWindow::on_action_Open_Log_triggered() thread->start(); } } + +void MainWindow::on_action_About_triggered() +{ + AboutDialog about(this); + about.exec(); +} diff --git a/qrenderdoc/Windows/MainWindow.h b/qrenderdoc/Windows/MainWindow.h index 05344b3c2..3fa1fb74a 100644 --- a/qrenderdoc/Windows/MainWindow.h +++ b/qrenderdoc/Windows/MainWindow.h @@ -21,7 +21,7 @@ class MainWindow : public QMainWindow private slots: void on_action_Exit_triggered(); - + void on_action_About_triggered(); void on_action_Open_Log_triggered(); private: diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro index ded9c8aa8..afed48853 100644 --- a/qrenderdoc/qrenderdoc.pro +++ b/qrenderdoc/qrenderdoc.pro @@ -65,6 +65,7 @@ SOURCES += Code/main.cpp \ Windows/MainWindow.cpp \ Windows/EventBrowser.cpp \ Windows/TextureViewer.cpp \ + Windows/AboutDialog.cpp \ Widgets/CustomPaintWidget.cpp \ 3rdparty/toolwindowmanager/ToolWindowManager.cpp \ 3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp \ @@ -77,6 +78,7 @@ SOURCES += Code/main.cpp \ HEADERS += Windows/MainWindow.h \ Windows/EventBrowser.h \ Windows/TextureViewer.h \ + Windows/AboutDialog.h \ Widgets/CustomPaintWidget.h \ 3rdparty/toolwindowmanager/ToolWindowManager.h \ 3rdparty/toolwindowmanager/ToolWindowManagerArea.h \ @@ -88,7 +90,8 @@ HEADERS += Windows/MainWindow.h \ FORMS += Windows/MainWindow.ui \ Windows/EventBrowser.ui \ - Windows/TextureViewer.ui + Windows/TextureViewer.ui \ + Windows/AboutDialog.ui RESOURCES += \ resources.qrc From 0b81ae2618de8cf4d765076323735e9bc877ec40 Mon Sep 17 00:00:00 2001 From: Cory Bloor Date: Sun, 17 Apr 2016 04:47:21 -0600 Subject: [PATCH 5/5] Update renderdocui about dialog copyright year --- renderdocui/Windows/Dialogs/AboutDialog.Designer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renderdocui/Windows/Dialogs/AboutDialog.Designer.cs b/renderdocui/Windows/Dialogs/AboutDialog.Designer.cs index a14942f53..e871b1657 100644 --- a/renderdocui/Windows/Dialogs/AboutDialog.Designer.cs +++ b/renderdocui/Windows/Dialogs/AboutDialog.Designer.cs @@ -77,7 +77,7 @@ this.label2.Size = new System.Drawing.Size(439, 122); this.label2.TabIndex = 2; this.label2.Text = "Baldur Karlsson\r\nbaldurk@baldurk.org\r\nhttps://github.com/baldurk/renderdoc\r\nCopy" + - "right Baldur Karlsson 2015"; + "right Baldur Karlsson 2016"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // ok