lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-20 05:26:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename ID variable to resourceId for consistency in API

Browse Source
This commit is contained in:
baldurk
2018-03-01 18:45:32 +00:00
parent e060c1b410
commit dd21423784
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/TextureViewer.cpp
+3 -3
View File
@@ -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)
renderdoc/api/replay/control_types.h
+1 -1
View File
@@ -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;
renderdoc/replay/replay_controller.cpp
+2 -2
View File
@@ -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;
}