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

Change by-ref passed float or bool parameters to callbacks in public API

Browse Source 
* Mostly used for passing a progress float back during a long blocking
  call like opening a capture or doing a copy.
* This is much more feasible for python to bind to.
* In several cases we just use a tiny lambda that updates a float anyway
  since we can't push the progress directly into a progress dialog, but
  need to let it query from a temporary in-between float.
This commit is contained in:
baldurk
2018-01-01 14:56:10 +00:00
parent 2e74989b69
commit 7a2305ae31
24 changed files with 212 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/core/remote_server.cpp
+32 -33
View File
@@ -406,7 +406,7 @@ static void ActiveRemoteClientThread(ClientThread *threadData)
bool kill = false;
float progress = 0.0f;
RenderDoc::Inst().SetProgressPointer<LoadProgress>(&progress);
RenderDoc::Inst().SetProgressCallback<LoadProgress>([&progress](float p) { progress = p; });
Threading::ThreadHandle ticker = Threading::CreateThread([&writer, &kill, &progress]() {
while(!kill)
@@ -439,7 +439,7 @@ static void ActiveRemoteClientThread(ClientThread *threadData)
}
else
{
RenderDoc::Inst().SetProgressPointer<LoadProgress>(NULL);
RenderDoc::Inst().SetProgressCallback<LoadProgress>(RENDERDOC_ProgressCallback());
kill = true;
Threading::JoinThread(ticker);
@@ -510,7 +510,8 @@ static void ActiveRemoteClientThread(ClientThread *threadData)
}
});
resolver = Callstack::MakeResolver(buf.data(), buf.size(), &progress);
resolver = Callstack::MakeResolver(buf.data(), buf.size(),
[&progress](float p) { progress = p; });
Threading::JoinThread(ticker);
Threading::CloseThread(ticker);
@@ -764,7 +765,8 @@ static void ActiveRemoteClientThread(ClientThread *threadData)
SAFE_DELETE(client);
}
void RenderDoc::BecomeRemoteServer(const char *listenhost, uint16_t port, volatile bool &killReplay)
void RenderDoc::BecomeRemoteServer(const char *listenhost, uint16_t port,
RENDERDOC_KillCallback killReplay)
{
Network::Socket *sock = Network::CreateServerSocket(listenhost, port, 1);
@@ -855,7 +857,7 @@ void RenderDoc::BecomeRemoteServer(const char *listenhost, uint16_t port, volati
std::vector<ClientThread *> inactives;
while(!killReplay)
while(!killReplay())
{
Network::Socket *client = sock->AcceptClient(false);
@@ -1230,7 +1232,8 @@ public:
return ident;
}
void CopyCaptureFromRemote(const char *remotepath, const char *localpath, float *progress)
void CopyCaptureFromRemote(const char *remotepath, const char *localpath,
RENDERDOC_ProgressCallback progress)
{
std::string path = remotepath;
@@ -1240,10 +1243,6 @@ public:
SERIALISE_ELEMENT(path);
}
float dummy = 0.0f;
if(progress == NULL)
progress = &dummy;
{
READ_DATA_SCOPE();
RemoteServerPacket type = ser.ReadChunk<RemoteServerPacket>();
@@ -1252,7 +1251,7 @@ public:
{
StreamWriter streamWriter(FileIO::fopen(localpath, "wb"), Ownership::Stream);
ser.SerialiseStream(localpath, streamWriter, NULL);
ser.SerialiseStream(localpath, streamWriter, progress);
if(ser.IsErrored())
{
@@ -1269,14 +1268,14 @@ public:
}
}
rdcstr CopyCaptureToRemote(const char *filename, float *progress)
rdcstr CopyCaptureToRemote(const char *filename, RENDERDOC_ProgressCallback progress)
{
{
WRITE_DATA_SCOPE();
SCOPED_SERIALISE_CHUNK(eRemoteServer_CopyCaptureToRemote);
StreamReader fileStream(FileIO::fopen(filename, "rb"));
ser.SerialiseStream(filename, fileStream);
ser.SerialiseStream(filename, fileStream, progress);
}
std::string path;
@@ -1312,7 +1311,7 @@ public:
}
rdcpair<ReplayStatus, IReplayController *> OpenCapture(uint32_t proxyid, const char *filename,
float *progressPtr)
RENDERDOC_ProgressCallback progress)
{
rdcpair<ReplayStatus, IReplayController *> ret;
ret.first = ReplayStatus::InternalError;
@@ -1325,12 +1324,6 @@ public:
return ret;
}
float dummy = 0.0f;
if(progressPtr == NULL)
progressPtr = &dummy;
float &progress = *progressPtr;
// if the proxy id is ~0U, then we just don't care so let RenderDoc pick the most
// appropriate supported proxy for the current platform.
RDCDriver proxydrivertype = proxyid == ~0U ? RDCDriver::Unknown : m_Proxies[proxyid].first;
@@ -1350,11 +1343,16 @@ public:
if(reader.IsErrored() || type != eRemoteServer_LogOpenProgress)
break;
SERIALISE_ELEMENT(progress);
float progressValue = 0.0f;
SERIALISE_ELEMENT(progressValue);
ser.EndChunk();
RDCLOG("% 3.0f%%...", progress * 100.0f);
if(progress)
progress(progressValue);
RDCLOG("% 3.0f%%...", progressValue * 100.0f);
}
if(reader.IsErrored() || type != eRemoteServer_LogOpened)
@@ -1370,7 +1368,8 @@ public:
ser.EndChunk();
}
progress = 1.0f;
if(progress)
progress(1.0f);
if(status != ReplayStatus::Succeeded)
{
@@ -1624,14 +1623,8 @@ public:
return hasCallstacks;
}
bool InitResolver(float *progressPtr)
bool InitResolver(RENDERDOC_ProgressCallback progress)
{
float dummy = 0.0f;
if(progressPtr == NULL)
progressPtr = &dummy;
float &progress = *progressPtr;
{
WRITE_DATA_SCOPE();
SCOPED_SERIALISE_CHUNK(eRemoteServer_InitResolver);
@@ -1646,11 +1639,16 @@ public:
if(reader.IsErrored() || type != eRemoteServer_ResolverProgress)
break;
SERIALISE_ELEMENT(progress);
float progressValue = 0.0f;
SERIALISE_ELEMENT(progressValue);
ser.EndChunk();
RDCLOG("% 3.0f%%...", progress * 100.0f);
if(progress)
progress(progressValue);
RDCLOG("% 3.0f%%...", progressValue * 100.0f);
}
if(reader.IsErrored() || type != eRemoteServer_InitResolver)
@@ -1665,7 +1663,8 @@ public:
ser.EndChunk();
}
progress = 1.0f;
if(progress)
progress(1.0f);
return success;
}