From 61b227580d38f18a65f85f27726ea539439067b4 Mon Sep 17 00:00:00 2001 From: Richard Khoury Date: Fri, 15 Dec 2017 08:11:56 +1100 Subject: [PATCH] Removing unnecessary addition of the ReplayOutput::GetTextureDisplay. This member function wasn't required and the TextureDisplay was accessible from within the TexxtureViewer as m_TexDisplay. --- qrenderdoc/Windows/TextureViewer.cpp | 4 ++-- renderdoc/replay/replay_controller.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp index 9b7770baa..cc5809091 100644 --- a/qrenderdoc/Windows/TextureViewer.cpp +++ b/qrenderdoc/Windows/TextureViewer.cpp @@ -3377,8 +3377,8 @@ void TextureViewer::on_saveTex_clicked() config.id = id; } - const auto overlayTexID = m_Output->GetDebugOverlayTexID(); - const bool hasSelectedOverlay = (m_Output->GetTextureDisplay().overlay != DebugOverlay::NoOverlay); + const ResourceId overlayTexID = m_Output->GetDebugOverlayTexID(); + const bool hasSelectedOverlay = (m_TexDisplay.overlay != DebugOverlay::NoOverlay); const bool hasOverlay = (hasSelectedOverlay && overlayTexID != ResourceId()); TextureSaveDialog saveDialog(*texptr, hasOverlay, config, this); int res = RDDialog::show(&saveDialog); diff --git a/renderdoc/replay/replay_controller.h b/renderdoc/replay/replay_controller.h index f33996686..11a888143 100644 --- a/renderdoc/replay/replay_controller.h +++ b/renderdoc/replay/replay_controller.h @@ -56,7 +56,6 @@ public: ResourceId GetCustomShaderTexID() { return m_CustomShaderResourceId; } ResourceId GetDebugOverlayTexID() { return m_OverlayResourceId; } - const TextureDisplay &GetTextureDisplay() { return m_RenderData.texDisplay; } PixelValue PickPixel(ResourceId texID, bool customShader, uint32_t x, uint32_t y, uint32_t sliceFace, uint32_t mip, uint32_t sample); rdcpair PickVertex(uint32_t eventID, uint32_t x, uint32_t y);