diff --git a/docs/window/settings_window.rst b/docs/window/settings_window.rst index e1a21d4e2..2e74694bb 100644 --- a/docs/window/settings_window.rst +++ b/docs/window/settings_window.rst @@ -258,26 +258,6 @@ You can disable this option here if you want to view a pure list of drawcalls wi This option only applies itself the next time you load a capture. ---------------- - - | :guilabel:`Hide empty marker sections` Default: ``Disabled`` - -Marker sections that contain no API calls or drawcalls will be completely removed. This also applies to the Timeline Bar. - -This option only applies itself the next time you load a capture. - - ---------------- - - | :guilabel:`Hide marker sections with only non-draw API calls` Default: ``Disabled`` - -Marker sections that contain only miscellaneous non-draw API calls like queries or state setting will be completely removed. This also applies to the Timeline Bar. - -This can be useful if you have markers around occlusion queries or where you have a minor state change, and you don't want them cluttering up the capture. - -This option only applies itself the next time you load a capture. - - --------------- | :guilabel:`Apply marker colors` Default: ``Enabled`` diff --git a/qrenderdoc/Code/Interface/PersistantConfig.h b/qrenderdoc/Code/Interface/PersistantConfig.h index 896d6b1aa..c0d3e9ffd 100644 --- a/qrenderdoc/Code/Interface/PersistantConfig.h +++ b/qrenderdoc/Code/Interface/PersistantConfig.h @@ -424,21 +424,6 @@ DECLARE_REFLECTION_STRUCT(BugReport); "Defaults to ``True``."); \ CONFIG_SETTING_VAL(public, bool, bool, EventBrowser_AddFake, true) \ \ - DOCUMENT( \ - "``True`` if the :class:`EventBrowser` should hide marker regions that don't contain any " \ - "actual non-marker events.\n" \ - "\n" \ - "Defaults to ``False``."); \ - CONFIG_SETTING_VAL(public, bool, bool, EventBrowser_HideEmpty, false) \ - \ - DOCUMENT( \ - "``True`` if the :class:`EventBrowser` should hide marker regions that don't contain any " \ - "events that aren't just drawcalls (this will hide events under 'API Events' " \ - "faux-markers).\n" \ - "\n" \ - "Defaults to ``False``."); \ - CONFIG_SETTING_VAL(public, bool, bool, EventBrowser_HideAPICalls, false) \ - \ DOCUMENT( \ "``True`` if the :class:`EventBrowser` should apply any colors specified with API marker " \ "regions.\n" \ diff --git a/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp b/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp index 3992cfed2..90c1d272d 100644 --- a/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp @@ -225,8 +225,6 @@ SettingsDialog::SettingsDialog(ICaptureContext &ctx, QWidget *parent) ui->EventBrowser_TimeUnit->setCurrentIndex((int)m_Ctx.Config().EventBrowser_TimeUnit); ui->EventBrowser_AddFake->setChecked(m_Ctx.Config().EventBrowser_AddFake); - ui->EventBrowser_HideEmpty->setChecked(m_Ctx.Config().EventBrowser_HideEmpty); - ui->EventBrowser_HideAPICalls->setChecked(m_Ctx.Config().EventBrowser_HideAPICalls); ui->EventBrowser_ApplyColors->setChecked(m_Ctx.Config().EventBrowser_ApplyColors); ui->EventBrowser_ColorEventRow->setChecked(m_Ctx.Config().EventBrowser_ColorEventRow); @@ -1009,20 +1007,6 @@ void SettingsDialog::on_EventBrowser_AddFake_toggled(bool checked) m_Ctx.Config().Save(); } -void SettingsDialog::on_EventBrowser_HideEmpty_toggled(bool checked) -{ - m_Ctx.Config().EventBrowser_HideEmpty = ui->EventBrowser_HideEmpty->isChecked(); - - m_Ctx.Config().Save(); -} - -void SettingsDialog::on_EventBrowser_HideAPICalls_toggled(bool checked) -{ - m_Ctx.Config().EventBrowser_HideAPICalls = ui->EventBrowser_HideAPICalls->isChecked(); - - m_Ctx.Config().Save(); -} - void SettingsDialog::on_EventBrowser_ApplyColors_toggled(bool checked) { m_Ctx.Config().EventBrowser_ApplyColors = ui->EventBrowser_ApplyColors->isChecked(); diff --git a/qrenderdoc/Windows/Dialogs/SettingsDialog.h b/qrenderdoc/Windows/Dialogs/SettingsDialog.h index d2530309d..331ab1ad3 100644 --- a/qrenderdoc/Windows/Dialogs/SettingsDialog.h +++ b/qrenderdoc/Windows/Dialogs/SettingsDialog.h @@ -98,8 +98,6 @@ private slots: // event browser void on_EventBrowser_TimeUnit_currentIndexChanged(int index); void on_EventBrowser_AddFake_toggled(bool checked); - void on_EventBrowser_HideEmpty_toggled(bool checked); - void on_EventBrowser_HideAPICalls_toggled(bool checked); void on_EventBrowser_ApplyColors_toggled(bool checked); void on_EventBrowser_ColorEventRow_toggled(bool checked); diff --git a/qrenderdoc/Windows/Dialogs/SettingsDialog.ui b/qrenderdoc/Windows/Dialogs/SettingsDialog.ui index ee074af4f..41b7ff3b9 100644 --- a/qrenderdoc/Windows/Dialogs/SettingsDialog.ui +++ b/qrenderdoc/Windows/Dialogs/SettingsDialog.ui @@ -1004,49 +1004,6 @@ After interop is enabled you will need to reload any capture. Event Browser - - - - In the Event Browser and Timeline Bar, marker sections that contain only non-draw API calls - e.g. only queries, or only state setting - will be completely removed - - - Hide marker sections with only non-draw API calls (requires file reload) - - - true - - - - - - - In the Event Browser and Timeline Bar, marker sections that contain only non-draw API calls - e.g. only queries, or only state setting - will be completely removed - - - - - - - - - - In the Event Browser and Timeline Bar, marker sections that contain no API calls or drawcalls will be completely removed - - - - - - - - - - In the Event Browser and Timeline Bar, marker sections that contain no API calls or drawcalls will be completely removed - - - Hide empty marker sections (requires file reload) - - - @@ -1083,7 +1040,7 @@ After interop is enabled you will need to reload any capture. - + When coloring marker sections in the Event Browser, the whole row of a marker region will be colored, not just a bar to the left of its children. @@ -1093,7 +1050,7 @@ After interop is enabled you will need to reload any capture. - + In the Event Browser and Timeline Bar, marker sections and marker labels will be colored with an API-specified color. @@ -1104,7 +1061,7 @@ After interop is enabled you will need to reload any capture. - + When coloring marker sections in the Event Browser, the whole row of a marker region will be colored, not just a bar to the left of its children. @@ -1114,7 +1071,7 @@ After interop is enabled you will need to reload any capture. - + In the Event Browser and Timeline Bar, marker sections and marker labels will be colored with an API-specified color.