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

Rename RemoteAccess to TargetControl to better disambiguate RemoteServer

Browse Source
This commit is contained in:
baldurk
2016-08-19 12:23:19 +02:00
parent 4bfbcbd14d
commit 481a28dc29
29 changed files with 316 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/replay/app_api.cpp
+18 -17
View File
@@ -113,12 +113,12 @@ static void TriggerMultiFrameCapture(uint32_t numFrames)
RenderDoc::Inst().TriggerCapture(numFrames);
}
static uint32_t IsRemoteAccessConnected()
static uint32_t IsTargetControlConnected()
{
return RenderDoc::Inst().IsRemoteAccessConnected();
return RenderDoc::Inst().IsTargetControlConnected();
}
static uint32_t LaunchReplayUI(uint32_t connectRemoteAccess, const char *cmdline)
static uint32_t LaunchReplayUI(uint32_t connectTargetControl, const char *cmdline)
{
string replayapp = FileIO::GetReplayAppFilename();
@@ -126,9 +126,9 @@ static uint32_t LaunchReplayUI(uint32_t connectRemoteAccess, const char *cmdline
return 0;
string cmd = cmdline ? cmdline : "";
if(connectRemoteAccess)
cmd +=
StringFormat::Fmt(" --remoteaccess localhost:%u", RenderDoc::Inst().GetRemoteAccessIdent());
if(connectTargetControl)
cmd += StringFormat::Fmt(" --targetcontrol localhost:%u",
RenderDoc::Inst().GetTargetControlIdent());
return Process::LaunchProcess(replayapp.c_str(), "", cmd.c_str());
}
@@ -165,22 +165,22 @@ int RENDERDOC_CC SetCaptureOptionF32(RENDERDOC_CaptureOption opt, float val);
uint32_t RENDERDOC_CC GetCaptureOptionU32(RENDERDOC_CaptureOption opt);
float RENDERDOC_CC GetCaptureOptionF32(RENDERDOC_CaptureOption opt);
void RENDERDOC_CC GetAPIVersion_1_1_0(int *major, int *minor, int *patch)
void RENDERDOC_CC GetAPIVersion_1_1_1(int *major, int *minor, int *patch)
{
if(major)
*major = 1;
if(minor)
*minor = 1;
if(patch)
*patch = 0;
*patch = 1;
}
RENDERDOC_API_1_1_0 api_1_1_0;
void Init_1_1_0()
RENDERDOC_API_1_1_1 api_1_1_1;
void Init_1_1_1()
{
RENDERDOC_API_1_1_0 &api = api_1_1_0;
RENDERDOC_API_1_1_1 &api = api_1_1_1;
api.GetAPIVersion = &GetAPIVersion_1_1_0;
api.GetAPIVersion = &GetAPIVersion_1_1_1;
api.SetCaptureOptionU32 = &SetCaptureOptionU32;
api.SetCaptureOptionF32 = &SetCaptureOptionF32;
@@ -205,7 +205,7 @@ void Init_1_1_0()
api.TriggerCapture = &TriggerCapture;
api.IsRemoteAccessConnected = &IsRemoteAccessConnected;
api.IsTargetControlConnected = &IsTargetControlConnected;
api.LaunchReplayUI = &LaunchReplayUI;
api.SetActiveWindow = &SetActiveWindow;
@@ -238,10 +238,11 @@ extern "C" RENDERDOC_API int RENDERDOC_CC RENDERDOC_GetAPI(RENDERDOC_Version ver
ret = 1; \
}
API_VERSION_HANDLE(1_0_0, 1_1_0);
API_VERSION_HANDLE(1_0_1, 1_1_0);
API_VERSION_HANDLE(1_0_2, 1_1_0);
API_VERSION_HANDLE(1_1_0, 1_1_0);
API_VERSION_HANDLE(1_0_0, 1_1_1);
API_VERSION_HANDLE(1_0_1, 1_1_1);
API_VERSION_HANDLE(1_0_2, 1_1_1);
API_VERSION_HANDLE(1_1_0, 1_1_1);
API_VERSION_HANDLE(1_1_1, 1_1_1);
#undef API_VERSION_HANDLE
renderdoc/replay/entry_points.cpp
+7 -7
View File
@@ -424,8 +424,8 @@ extern "C" RENDERDOC_API void *RENDERDOC_CC RENDERDOC_AllocArrayMem(uint64_t sz)
return rdctype::array<char>::allocate((size_t)sz);
}
extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_EnumerateRemoteConnections(const char *host,
uint32_t nextIdent)
extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_EnumerateRemoteTargets(const char *host,
uint32_t nextIdent)
{
string s = "localhost";
if(host != NULL && host[0] != '\0')
@@ -435,11 +435,11 @@ extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_EnumerateRemoteConnecti
// otherwise we're called with the last successful ident, so increment
// before continuing to enumerate.
if(nextIdent == 0)
nextIdent = RenderDoc_FirstCaptureNetworkPort;
nextIdent = RenderDoc_FirstTargetControlPort;
else
nextIdent++;
for(; nextIdent <= RenderDoc_LastCaptureNetworkPort; nextIdent++)
for(; nextIdent <= RenderDoc_LastTargetControlPort; nextIdent++)
{
Network::Socket *sock = Network::CreateClientSocket(s.c_str(), (uint16_t)nextIdent, 250);
@@ -454,9 +454,9 @@ extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_EnumerateRemoteConnecti
return ~0U;
}
extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_GetDefaultReplayHostPort()
extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_GetDefaultRemoteServerPort()
{
return RenderDoc_ReplayNetworkPort;
return RenderDoc_RemoteServerPort;
}
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_BecomeRemoteServer(const char *listenhost,
@@ -472,7 +472,7 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_BecomeRemoteServer(const ch
listenhost = "0.0.0.0";
if(port == 0)
port = RENDERDOC_GetDefaultReplayHostPort();
port = RENDERDOC_GetDefaultRemoteServerPort();
RenderDoc::Inst().BecomeRemoteServer(listenhost, (uint16_t)port, *killReplay);
}