mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-07-08 08:40:55 +00:00
re-indent Qt code to match rest of C++ code
This commit is contained in:
baldurk
+100
-100
@@ -6,8 +6,8 @@
|
||||
|
||||
RenderManager::RenderManager()
|
||||
{
|
||||
m_Running = false;
|
||||
m_Thread = NULL;
|
||||
m_Running = false;
|
||||
m_Thread = NULL;
|
||||
}
|
||||
|
||||
RenderManager::~RenderManager()
|
||||
@@ -17,157 +17,157 @@ RenderManager::~RenderManager()
|
||||
|
||||
void RenderManager::Init(int proxyRenderer, QString replayHost, QString logfile, float *progress)
|
||||
{
|
||||
if(m_Running)
|
||||
return;
|
||||
if(m_Running)
|
||||
return;
|
||||
|
||||
m_ProxyRenderer = proxyRenderer;
|
||||
m_ReplayHost = replayHost;
|
||||
m_Logfile = logfile;
|
||||
m_Progress = progress;
|
||||
m_ProxyRenderer = proxyRenderer;
|
||||
m_ReplayHost = replayHost;
|
||||
m_Logfile = logfile;
|
||||
m_Progress = progress;
|
||||
|
||||
*progress = 0.0f;
|
||||
*progress = 0.0f;
|
||||
|
||||
m_Thread = new LambdaThread([this]() { run(); });
|
||||
m_Thread->start(QThread::HighestPriority);
|
||||
m_Thread = new LambdaThread([this]() { run(); });
|
||||
m_Thread->start(QThread::HighestPriority);
|
||||
|
||||
while (m_Thread->isRunning() && !m_Running) {}
|
||||
while(m_Thread->isRunning() && !m_Running) {}
|
||||
}
|
||||
|
||||
bool RenderManager::IsRunning()
|
||||
{
|
||||
return m_Thread->isRunning() && m_Running;
|
||||
return m_Thread->isRunning() && m_Running;
|
||||
}
|
||||
|
||||
void RenderManager::AsyncInvoke(RenderManager::InvokeMethod m)
|
||||
{
|
||||
InvokeHandle *cmd = new InvokeHandle(m);
|
||||
cmd->selfdelete = true;
|
||||
InvokeHandle *cmd = new InvokeHandle(m);
|
||||
cmd->selfdelete = true;
|
||||
|
||||
PushInvoke(cmd);
|
||||
PushInvoke(cmd);
|
||||
}
|
||||
|
||||
void RenderManager::BlockInvoke(RenderManager::InvokeMethod m)
|
||||
{
|
||||
InvokeHandle *cmd = new InvokeHandle(m);
|
||||
InvokeHandle *cmd = new InvokeHandle(m);
|
||||
|
||||
PushInvoke(cmd);
|
||||
PushInvoke(cmd);
|
||||
|
||||
while(!cmd->processed) {}
|
||||
while(!cmd->processed) {}
|
||||
}
|
||||
|
||||
void RenderManager::CloseThread()
|
||||
{
|
||||
m_Running = false;
|
||||
m_Running = false;
|
||||
|
||||
m_RenderCondition.wakeAll();
|
||||
m_RenderCondition.wakeAll();
|
||||
|
||||
// wait for the thread to close and clean up
|
||||
while(m_Thread->isRunning()) {}
|
||||
// wait for the thread to close and clean up
|
||||
while(m_Thread->isRunning()) {}
|
||||
|
||||
m_Thread->deleteLater();
|
||||
m_Thread->deleteLater();
|
||||
}
|
||||
|
||||
void RenderManager::PushInvoke(RenderManager::InvokeHandle *cmd)
|
||||
{
|
||||
if(m_Thread == NULL || !m_Thread->isRunning() || !m_Running)
|
||||
{
|
||||
cmd->processed = true;
|
||||
if(cmd->selfdelete) delete cmd;
|
||||
return;
|
||||
}
|
||||
if(m_Thread == NULL || !m_Thread->isRunning() || !m_Running)
|
||||
{
|
||||
cmd->processed = true;
|
||||
if(cmd->selfdelete) delete cmd;
|
||||
return;
|
||||
}
|
||||
|
||||
m_RenderLock.lock();
|
||||
m_RenderQueue.push_back(cmd);
|
||||
m_RenderLock.unlock();
|
||||
m_RenderLock.lock();
|
||||
m_RenderQueue.push_back(cmd);
|
||||
m_RenderLock.unlock();
|
||||
|
||||
m_RenderCondition.wakeAll();
|
||||
m_RenderCondition.wakeAll();
|
||||
}
|
||||
|
||||
void RenderManager::run()
|
||||
{
|
||||
IReplayRenderer *renderer = NULL;
|
||||
IRemoteRenderer *remote = NULL;
|
||||
IReplayRenderer *renderer = NULL;
|
||||
IRemoteRenderer *remote = NULL;
|
||||
|
||||
if (m_ProxyRenderer < 0)
|
||||
{
|
||||
m_CreateStatus = RENDERDOC_CreateReplayRenderer(m_Logfile.toUtf8(), m_Progress, &renderer);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_CreateStatus = RENDERDOC_CreateRemoteReplayConnection(m_ReplayHost.toUtf8(), &remote);
|
||||
if(m_ProxyRenderer < 0)
|
||||
{
|
||||
m_CreateStatus = RENDERDOC_CreateReplayRenderer(m_Logfile.toUtf8(), m_Progress, &renderer);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_CreateStatus = RENDERDOC_CreateRemoteReplayConnection(m_ReplayHost.toUtf8(), &remote);
|
||||
|
||||
if(remote == NULL)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if(remote == NULL)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_CreateStatus = remote->CreateProxyRenderer(m_ProxyRenderer, m_Logfile.toUtf8(), m_Progress, &renderer);
|
||||
m_CreateStatus = remote->CreateProxyRenderer(m_ProxyRenderer, m_Logfile.toUtf8(), m_Progress, &renderer);
|
||||
|
||||
if(renderer == NULL)
|
||||
{
|
||||
remote->Shutdown();
|
||||
remote = NULL;
|
||||
return;
|
||||
}
|
||||
}
|
||||
if(renderer == NULL)
|
||||
{
|
||||
remote->Shutdown();
|
||||
remote = NULL;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if(renderer == NULL)
|
||||
return;
|
||||
if(renderer == NULL)
|
||||
return;
|
||||
|
||||
RENDERDOC_LogText(QString("QRenderDoc - renderer created for %1").arg(m_Logfile).toUtf8());
|
||||
RENDERDOC_LogText(QString("QRenderDoc - renderer created for %1").arg(m_Logfile).toUtf8());
|
||||
|
||||
m_Running = true;
|
||||
m_Running = true;
|
||||
|
||||
// main render command loop
|
||||
while(m_Running)
|
||||
{
|
||||
QQueue<InvokeHandle *> queue;
|
||||
// main render command loop
|
||||
while(m_Running)
|
||||
{
|
||||
QQueue<InvokeHandle *> queue;
|
||||
|
||||
// wait for the condition to be woken, grab current queue,
|
||||
// unlock again.
|
||||
{
|
||||
m_RenderLock.lock();
|
||||
m_RenderCondition.wait(&m_RenderLock);
|
||||
m_RenderQueue.swap(queue);
|
||||
m_RenderLock.unlock();
|
||||
}
|
||||
// wait for the condition to be woken, grab current queue,
|
||||
// unlock again.
|
||||
{
|
||||
m_RenderLock.lock();
|
||||
m_RenderCondition.wait(&m_RenderLock);
|
||||
m_RenderQueue.swap(queue);
|
||||
m_RenderLock.unlock();
|
||||
}
|
||||
|
||||
// process all the commands
|
||||
for(InvokeHandle *cmd : queue)
|
||||
{
|
||||
if(cmd == NULL) continue;
|
||||
// process all the commands
|
||||
for(InvokeHandle *cmd : queue)
|
||||
{
|
||||
if(cmd == NULL) continue;
|
||||
|
||||
if(cmd->method != NULL)
|
||||
cmd->method(renderer);
|
||||
if(cmd->method != NULL)
|
||||
cmd->method(renderer);
|
||||
|
||||
cmd->processed = true;
|
||||
cmd->processed = true;
|
||||
|
||||
// if it's a throwaway command, delete it
|
||||
if(cmd->selfdelete)
|
||||
delete cmd;
|
||||
}
|
||||
}
|
||||
// if it's a throwaway command, delete it
|
||||
if(cmd->selfdelete)
|
||||
delete cmd;
|
||||
}
|
||||
}
|
||||
|
||||
// clean up anything left in the queue
|
||||
{
|
||||
QQueue<InvokeHandle *> queue;
|
||||
// clean up anything left in the queue
|
||||
{
|
||||
QQueue<InvokeHandle *> queue;
|
||||
|
||||
m_RenderLock.lock();
|
||||
m_RenderQueue.swap(queue);
|
||||
m_RenderLock.unlock();
|
||||
m_RenderLock.lock();
|
||||
m_RenderQueue.swap(queue);
|
||||
m_RenderLock.unlock();
|
||||
|
||||
for(InvokeHandle *cmd : queue)
|
||||
{
|
||||
if(cmd == NULL) continue;
|
||||
for(InvokeHandle *cmd : queue)
|
||||
{
|
||||
if(cmd == NULL) continue;
|
||||
|
||||
cmd->processed = true;
|
||||
cmd->processed = true;
|
||||
|
||||
if(cmd->selfdelete)
|
||||
delete cmd;
|
||||
}
|
||||
}
|
||||
if(cmd->selfdelete)
|
||||
delete cmd;
|
||||
}
|
||||
}
|
||||
|
||||
// close the core renderer
|
||||
renderer->Shutdown();
|
||||
if(remote) remote->Shutdown();
|
||||
// close the core renderer
|
||||
renderer->Shutdown();
|
||||
if(remote) remote->Shutdown();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user