lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-29 21:30:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile warnings about shadowed variables.

Browse Source
This commit is contained in:
baldurk
2016-08-19 19:23:59 +02:00
parent 8183c0d2ac
commit 21a5bfd55a
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/core/remote_server.cpp
+10 -10
View File
@@ -197,7 +197,7 @@ static void ActiveRemoteClientThread(void *data)
if(client->IsRecvDataWaiting())
{
RemoteServerPacket type;
type = eRemoteServer_Noop;
Serialiser *recvser = NULL;
if(!RecvPacket(client, type, &recvser))
@@ -219,8 +219,8 @@ static void ActiveRemoteClientThread(void *data)
for(auto it = drivers.begin(); it != drivers.end(); ++it)
{
RDCDriver driver = it->first;
sendSer.Serialise("", driver);
RDCDriver driverType = it->first;
sendSer.Serialise("", driverType);
sendSer.Serialise("", (*it).second);
}
}
@@ -332,15 +332,15 @@ static void ActiveRemoteClientThread(void *data)
}
else if(RenderDoc::Inst().HasRemoteDriver(driverType))
{
ProgressLoopData data;
ProgressLoopData progressData;
data.sock = client;
data.killsignal = false;
data.progress = 0.0f;
progressData.sock = client;
progressData.killsignal = false;
progressData.progress = 0.0f;
RenderDoc::Inst().SetProgressPtr(&data.progress);
RenderDoc::Inst().SetProgressPtr(&progressData.progress);
Threading::ThreadHandle ticker = Threading::CreateThread(ProgressTicker, &data);
Threading::ThreadHandle ticker = Threading::CreateThread(ProgressTicker, &progressData);
status = RenderDoc::Inst().CreateRemoteDriver(driverType, cap_file.c_str(), &driver);
@@ -355,7 +355,7 @@ static void ActiveRemoteClientThread(void *data)
RenderDoc::Inst().SetProgressPtr(NULL);
data.killsignal = true;
progressData.killsignal = true;
Threading::JoinThread(ticker);
Threading::CloseThread(ticker);