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

Re-jig loading progress bar calculation to be smoother/more informative

Browse Source
This commit is contained in:
baldurk
2015-07-19 10:57:37 +02:00
parent cf8c3fdc8c
commit c9877b6d0b
7 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/core/core.cpp
+3 -2
View File
@@ -746,8 +746,9 @@ void RenderDoc::SetProgress(LoadProgressSection section, float delta)
float weights[NumSections];
// must sum to 1.0
weights[DebugManagerInit] = 0.4f;
weights[FileInitialRead] = 0.6f;
weights[DebugManagerInit] = 0.1f;
weights[FileInitialRead] = 0.75f;
weights[FrameEventsRead] = 0.15f;
float progress = 0.0f;
for(int i=0; i < section; i++)
renderdoc/core/core.h
+1
View File
@@ -146,6 +146,7 @@ enum LoadProgressSection
{
DebugManagerInit,
FileInitialRead,
FrameEventsRead,
NumSections,
};
renderdoc/driver/d3d11/d3d11_context.cpp
+3 -1
View File
@@ -1217,6 +1217,8 @@ void WrappedID3D11DeviceContext::ReplayLog(LogState readType, uint32_t startEven
m_pDevice->GetResourceManager()->MarkInFrame(true);
uint64_t startOffset = m_pSerialiser->GetOffset();
while(1)
{
if(m_State == EXECUTING && m_CurEventID > endEventID)
@@ -1231,7 +1233,7 @@ void WrappedID3D11DeviceContext::ReplayLog(LogState readType, uint32_t startEven
ProcessChunk(offset, chunktype, false);
RenderDoc::Inst().SetProgress(FileInitialRead, float(offset)/float(m_pSerialiser->GetSize()));
RenderDoc::Inst().SetProgress(FrameEventsRead, float(offset - startOffset)/float(m_pSerialiser->GetSize()));
// for now just abort after capture scope. Really we'd need to support multiple frames
// but for now this will do.
renderdoc/driver/d3d11/d3d11_device.cpp
+4 -2
View File
@@ -1006,9 +1006,11 @@ void WrappedID3D11Device::ReadLogInitialisation()
m_pSerialiser->Rewind();
uint32_t captureChunkIdx = 0;
while(!m_pSerialiser->AtEnd())
{
m_pSerialiser->SkipToChunk(CAPTURE_SCOPE);
m_pSerialiser->SkipToChunk(CAPTURE_SCOPE, &captureChunkIdx);
// found a capture chunk
if(!m_pSerialiser->AtEnd())
@@ -1054,7 +1056,7 @@ void WrappedID3D11Device::ReadLogInitialisation()
m_pSerialiser->PopContext(NULL, context);
RenderDoc::Inst().SetProgress(FileInitialRead, float(m_pSerialiser->GetOffset())/float(m_pSerialiser->GetSize()));
RenderDoc::Inst().SetProgress(FileInitialRead, float(chunkIdx)/float(captureChunkIdx));
if(context == CAPTURE_SCOPE)
{
renderdoc/driver/gl/gl_driver.cpp
+7 -3
View File
@@ -2830,9 +2830,11 @@ void WrappedOpenGL::ReadLogInitialisation()
m_pSerialiser->Rewind();
uint32_t captureChunkIdx = 0;
while(!m_pSerialiser->AtEnd())
{
m_pSerialiser->SkipToChunk(CAPTURE_SCOPE);
m_pSerialiser->SkipToChunk(CAPTURE_SCOPE, &captureChunkIdx);
// found a capture chunk
if(!m_pSerialiser->AtEnd())
@@ -2878,7 +2880,7 @@ void WrappedOpenGL::ReadLogInitialisation()
m_pSerialiser->PopContext(NULL, context);
RenderDoc::Inst().SetProgress(FileInitialRead, float(m_pSerialiser->GetOffset())/float(m_pSerialiser->GetSize()));
RenderDoc::Inst().SetProgress(FileInitialRead, float(chunkIdx)/float(captureChunkIdx));
if(context == CAPTURE_SCOPE)
{
@@ -3820,6 +3822,8 @@ void WrappedOpenGL::ContextReplayLog(LogState readType, uint32_t startEventID, u
GetResourceManager()->MarkInFrame(true);
uint64_t startOffset = m_pSerialiser->GetOffset();
while(1)
{
if(m_State == EXECUTING && m_CurEventID > endEventID)
@@ -3834,7 +3838,7 @@ void WrappedOpenGL::ContextReplayLog(LogState readType, uint32_t startEventID, u
ContextProcessChunk(offset, chunktype, false);
RenderDoc::Inst().SetProgress(FileInitialRead, float(offset)/float(m_pSerialiser->GetSize()));
RenderDoc::Inst().SetProgress(FrameEventsRead, float(offset - startOffset)/float(m_pSerialiser->GetSize()));
// for now just abort after capture scope. Really we'd need to support multiple frames
// but for now this will do.
renderdoc/serialise/serialiser.h
+3 -1
View File
@@ -268,7 +268,7 @@ class Serialiser
}
// assumes buffer head is sitting before a chunk (ie. pushcontext will be valid)
void SkipToChunk(uint32_t chunkIdx)
void SkipToChunk(uint32_t chunkIdx, uint32_t *idx = NULL)
{
do
{
@@ -289,6 +289,8 @@ class Serialiser
PopContext(NULL, 1);
}
if(idx) (*idx)++;
} while(!AtEnd());
}
renderdocui/Code/Core.cs
+1 -1
View File
@@ -420,7 +420,7 @@ namespace renderdocui.Code
{
Thread.Sleep(2);
float progress = 0.5f * m_Renderer.LoadProgress + 0.49f * postloadProgress + 0.01f;
float progress = 0.8f * m_Renderer.LoadProgress + 0.19f * postloadProgress + 0.01f;
modal.LogfileProgress(progress);