From fe30fa91fbd007638c06fecafa03f4a0d64d8aee Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 6 Feb 2020 19:10:43 +0000 Subject: [PATCH] Fix python binding consistency with wrong naming scheme --- qrenderdoc/Windows/ShaderViewer.cpp | 6 +++--- renderdoc/api/replay/shader_types.h | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp index 27ccc2839..8a1847844 100644 --- a/qrenderdoc/Windows/ShaderViewer.cpp +++ b/qrenderdoc/Windows/ShaderViewer.cpp @@ -1346,7 +1346,7 @@ bool ShaderViewer::stepBack() if(IsFirstState()) break; - if(m_Trace->lineInfo[GetCurrentState().nextInstruction].sourceEqual(oldLine)) + if(m_Trace->lineInfo[GetCurrentState().nextInstruction].SourceEqual(oldLine)) continue; break; @@ -1357,7 +1357,7 @@ bool ShaderViewer::stepBack() // now since a line can have multiple instructions, keep stepping (looking forward) until we // reach the first instruction with an identical line info while(!IsFirstState() && - m_Trace->lineInfo[GetPreviousState().nextInstruction].sourceEqual(oldLine)) + m_Trace->lineInfo[GetPreviousState().nextInstruction].SourceEqual(oldLine)) { applyBackwardsChange(); @@ -1398,7 +1398,7 @@ bool ShaderViewer::stepNext() if(IsLastState()) break; - if(m_Trace->lineInfo[GetCurrentState().nextInstruction].sourceEqual(oldLine)) + if(m_Trace->lineInfo[GetCurrentState().nextInstruction].SourceEqual(oldLine)) continue; break; diff --git a/renderdoc/api/replay/shader_types.h b/renderdoc/api/replay/shader_types.h index 73e0cdee8..a02b65b05 100644 --- a/renderdoc/api/replay/shader_types.h +++ b/renderdoc/api/replay/shader_types.h @@ -468,7 +468,11 @@ struct LineColumnInfo return false; } - bool sourceEqual(const LineColumnInfo &o) const + DOCUMENT(R"(:return: ``True`` if this object is equal to the parameter, disregarding + :data:`disassemblyLine`. +:rtype: ``bool`` +)"); + bool SourceEqual(const LineColumnInfo &o) const { // comparison without considering the disassembly line return fileIndex == o.fileIndex && lineStart == o.lineStart && lineEnd == o.lineEnd &&