From dd214237847a87297aa92574ccfcad89e6685603 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 1 Mar 2018 14:10:45 +0000 Subject: [PATCH] Rename ID variable to resourceId for consistency in API --- qrenderdoc/Windows/TextureViewer.cpp | 6 +++--- renderdoc/api/replay/control_types.h | 2 +- renderdoc/replay/replay_controller.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp index 8220becaf..4e206e864 100644 --- a/qrenderdoc/Windows/TextureViewer.cpp +++ b/qrenderdoc/Windows/TextureViewer.cpp @@ -3388,7 +3388,7 @@ void TextureViewer::on_saveTex_clicked() return; // overwrite save params with current texture display settings - m_SaveConfig.id = m_TexDisplay.resourceId; + m_SaveConfig.resourceId = m_TexDisplay.resourceId; m_SaveConfig.typeHint = m_TexDisplay.typeHint; m_SaveConfig.slice.sliceIndex = (int)m_TexDisplay.sliceFace; m_SaveConfig.mip = (int)m_TexDisplay.mip; @@ -3417,7 +3417,7 @@ void TextureViewer::on_saveTex_clicked() [this, &id](IReplayController *r) { id = m_Output->GetCustomShaderTexID(); }); if(id != ResourceId()) - m_SaveConfig.id = id; + m_SaveConfig.resourceId = id; } const ResourceId overlayTexID = m_Output->GetDebugOverlayTexID(); @@ -3430,7 +3430,7 @@ void TextureViewer::on_saveTex_clicked() if(saveDialog.saveOverlayInstead()) { - m_SaveConfig.id = overlayTexID; + m_SaveConfig.resourceId = overlayTexID; } if(res) diff --git a/renderdoc/api/replay/control_types.h b/renderdoc/api/replay/control_types.h index 319b64569..5ccbee26c 100644 --- a/renderdoc/api/replay/control_types.h +++ b/renderdoc/api/replay/control_types.h @@ -362,7 +362,7 @@ DOCUMENT("Describes a texture to save and how to map it to the destination file struct TextureSave { DOCUMENT("The :class:`ResourceId` of the texture to save."); - ResourceId id; + ResourceId resourceId; DOCUMENT("An optional :class:`CompType` hint to use when saving a typeless texture."); CompType typeHint = CompType::Typeless; diff --git a/renderdoc/replay/replay_controller.cpp b/renderdoc/replay/replay_controller.cpp index 2b0389533..3f4646de4 100644 --- a/renderdoc/replay/replay_controller.cpp +++ b/renderdoc/replay/replay_controller.cpp @@ -399,11 +399,11 @@ bytebuf ReplayController::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint bool ReplayController::SaveTexture(const TextureSave &saveData, const char *path) { TextureSave sd = saveData; // mutable copy - ResourceId liveid = m_pDevice->GetLiveID(sd.id); + ResourceId liveid = m_pDevice->GetLiveID(sd.resourceId); if(liveid == ResourceId()) { - RDCERR("Couldn't get Live ID for %llu getting texture data", sd.id); + RDCERR("Couldn't get Live ID for %llu getting texture data", sd.resourceId); return false; }