From 481a28dc29bfd43df5da8ae2b40df64696fbdc48 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 2 Aug 2016 17:03:55 +0200 Subject: [PATCH] Rename RemoteAccess to TargetControl to better disambiguate RemoteServer --- renderdoc/api/app/renderdoc_app.h | 58 +++++++++- renderdoc/api/replay/control_types.h | 6 +- renderdoc/api/replay/renderdoc_replay.h | 52 ++++----- renderdoc/api/replay/replay_enums.h | 18 ++-- renderdoc/common/globalconfig.h | 6 +- renderdoc/core/core.cpp | 20 ++-- renderdoc/core/core.h | 14 +-- renderdoc/core/remote_access.cpp | 100 +++++++++--------- renderdoc/core/remote_server.cpp | 2 +- renderdoc/core/replay_proxy.cpp | 94 ++++++++-------- renderdoc/core/replay_proxy.h | 8 +- renderdoc/driver/d3d11/d3d11_device.cpp | 4 +- renderdoc/driver/d3d12/d3d12_device.cpp | 4 +- renderdoc/driver/gl/gl_driver.cpp | 4 +- .../driver/vulkan/wrappers/vk_wsi_funcs.cpp | 6 +- .../os/posix/android/android_process.cpp | 4 +- renderdoc/os/posix/apple/apple_process.cpp | 2 +- renderdoc/os/posix/linux/linux_process.cpp | 4 +- renderdoc/os/win32/win32_process.cpp | 12 +-- renderdoc/replay/app_api.cpp | 35 +++--- renderdoc/replay/entry_points.cpp | 14 +-- renderdoccmd/renderdoccmd.cpp | 4 +- renderdocui/Code/AppMain.cs | 5 +- renderdocui/Interop/Enums.cs | 2 +- renderdocui/Interop/ReplayRenderer.cs | 66 ++++++------ renderdocui/Interop/StaticExports.cs | 14 +-- renderdocui/Windows/Dialogs/LiveCapture.cs | 4 +- .../Windows/Dialogs/RemoteHostSelect.cs | 4 +- renderdocui/Windows/Dialogs/UpdateDialog.cs | 4 +- 29 files changed, 316 insertions(+), 254 deletions(-) diff --git a/renderdoc/api/app/renderdoc_app.h b/renderdoc/api/app/renderdoc_app.h index a392cecbb..c09719553 100644 --- a/renderdoc/api/app/renderdoc_app.h +++ b/renderdoc/api/app/renderdoc_app.h @@ -380,18 +380,22 @@ typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetCapture)(uint32_t idx, char *logfil uint32_t *pathlength, uint64_t *timestamp); // returns 1 if the RenderDoc UI is connected to this application, 0 otherwise +// This was renamed to IsTargetControlConnected in API 1.1.1, the old typedef is kept here for +// backwards compatibility with old code, it is castable either way since it's ABI compatible +// as the same function pointer type. typedef uint32_t(RENDERDOC_CC *pRENDERDOC_IsRemoteAccessConnected)(); +typedef uint32_t(RENDERDOC_CC *pRENDERDOC_IsTargetControlConnected)(); // This function will launch the Replay UI associated with the RenderDoc library injected // into the running application. // -// if connectRemoteAccess is 1, the Replay UI will be launched with a command line parameter +// if connectTargetControl is 1, the Replay UI will be launched with a command line parameter // to connect to this application // cmdline is the rest of the command line, as a UTF-8 string. E.g. a captures to open // if cmdline is NULL, the command line will be empty. // // returns the PID of the replay UI if successful, 0 if not successful. -typedef uint32_t(RENDERDOC_CC *pRENDERDOC_LaunchReplayUI)(uint32_t connectRemoteAccess, +typedef uint32_t(RENDERDOC_CC *pRENDERDOC_LaunchReplayUI)(uint32_t connectTargetControl, const char *cmdline); // RenderDoc can return a higher version than requested if it's backwards compatible, @@ -474,6 +478,7 @@ typedef enum { eRENDERDOC_API_Version_1_0_1 = 10001, // RENDERDOC_API_1_0_1 = 1 00 01 eRENDERDOC_API_Version_1_0_2 = 10002, // RENDERDOC_API_1_0_2 = 1 00 02 eRENDERDOC_API_Version_1_1_0 = 10100, // RENDERDOC_API_1_1_0 = 1 01 00 + eRENDERDOC_API_Version_1_1_1 = 10101, // RENDERDOC_API_1_1_1 = 1 01 01 } RENDERDOC_Version; // API version changelog: @@ -484,6 +489,8 @@ typedef enum { // 1.0.2 - Refactor: Renamed eRENDERDOC_Option_DebugDeviceMode to eRENDERDOC_Option_APIValidation // 1.1.0 - Add feature: TriggerMultiFrameCapture(). Backwards compatible with 1.0.x since the new // function pointer is added to the end of the struct, the original layout is identical +// 1.1.1 - Refactor: Renamed remote access to target control (to better disambiguate from remote +// replay/remote server concept in replay UI) // eRENDERDOC_API_Version_1_1_0 typedef struct @@ -529,6 +536,53 @@ typedef RENDERDOC_API_1_1_0 RENDERDOC_API_1_0_0; typedef RENDERDOC_API_1_1_0 RENDERDOC_API_1_0_1; typedef RENDERDOC_API_1_1_0 RENDERDOC_API_1_0_2; +// although this structure is identical to RENDERDOC_API_1_1_0, the member +// IsRemoteAccessConnected was renamed to IsTargetControlConnected. So that +// old code can still compile with a new header, we must declare a new struct +// type. It can be casted back and forth though, so we will still return a +// pointer to this type for all previous API versions - the above struct is +// purely legacy for compilation compatibility + +// eRENDERDOC_API_Version_1_1_1 +typedef struct +{ + pRENDERDOC_GetAPIVersion GetAPIVersion; + + pRENDERDOC_SetCaptureOptionU32 SetCaptureOptionU32; + pRENDERDOC_SetCaptureOptionF32 SetCaptureOptionF32; + + pRENDERDOC_GetCaptureOptionU32 GetCaptureOptionU32; + pRENDERDOC_GetCaptureOptionF32 GetCaptureOptionF32; + + pRENDERDOC_SetFocusToggleKeys SetFocusToggleKeys; + pRENDERDOC_SetCaptureKeys SetCaptureKeys; + + pRENDERDOC_GetOverlayBits GetOverlayBits; + pRENDERDOC_MaskOverlayBits MaskOverlayBits; + + pRENDERDOC_Shutdown Shutdown; + pRENDERDOC_UnloadCrashHandler UnloadCrashHandler; + + pRENDERDOC_SetLogFilePathTemplate SetLogFilePathTemplate; + pRENDERDOC_GetLogFilePathTemplate GetLogFilePathTemplate; + + pRENDERDOC_GetNumCaptures GetNumCaptures; + pRENDERDOC_GetCapture GetCapture; + + pRENDERDOC_TriggerCapture TriggerCapture; + + pRENDERDOC_IsTargetControlConnected IsTargetControlConnected; + pRENDERDOC_LaunchReplayUI LaunchReplayUI; + + pRENDERDOC_SetActiveWindow SetActiveWindow; + + pRENDERDOC_StartFrameCapture StartFrameCapture; + pRENDERDOC_IsFrameCapturing IsFrameCapturing; + pRENDERDOC_EndFrameCapture EndFrameCapture; + + pRENDERDOC_TriggerMultiFrameCapture TriggerMultiFrameCapture; +} RENDERDOC_API_1_1_1; + ////////////////////////////////////////////////////////////////////////////////////////////////// // RenderDoc API entry point // diff --git a/renderdoc/api/replay/control_types.h b/renderdoc/api/replay/control_types.h index ba7e1c95d..464a35843 100644 --- a/renderdoc/api/replay/control_types.h +++ b/renderdoc/api/replay/control_types.h @@ -201,10 +201,10 @@ struct TextureSave int jpegQuality; }; -struct RemoteMessage +struct TargetControlMessage { - RemoteMessage() {} - RemoteMessageType Type; + TargetControlMessage() {} + TargetControlMessageType Type; struct NewCaptureData { diff --git a/renderdoc/api/replay/renderdoc_replay.h b/renderdoc/api/replay/renderdoc_replay.h index ced787356..38f315504 100644 --- a/renderdoc/api/replay/renderdoc_replay.h +++ b/renderdoc/api/replay/renderdoc_replay.h @@ -423,7 +423,7 @@ ReplayRenderer_GetTextureData(ReplayRenderer *rend, ResourceId tex, uint32_t arr // for C++ expose the interface as a virtual interface #ifdef __cplusplus -struct IRemoteAccess +struct ITargetControl { virtual void Shutdown() = 0; @@ -436,40 +436,40 @@ struct IRemoteAccess virtual void QueueCapture(uint32_t frameNumber) = 0; virtual void CopyCapture(uint32_t remoteID, const char *localpath) = 0; - virtual void ReceiveMessage(RemoteMessage *msg) = 0; + virtual void ReceiveMessage(TargetControlMessage *msg) = 0; }; #endif #ifdef RENDERDOC_EXPORTS -struct RemoteAccess; +struct TargetControl; #else #ifdef __cplusplus -typedef IRemoteAccess RemoteAccess; +typedef ITargetControl TargetControl; #else -struct RemoteAccess +struct TargetControl { }; #endif #endif -extern "C" RENDERDOC_API void RENDERDOC_CC RemoteAccess_Shutdown(RemoteAccess *access); +extern "C" RENDERDOC_API void RENDERDOC_CC TargetControl_Shutdown(TargetControl *control); -extern "C" RENDERDOC_API const char *RENDERDOC_CC RemoteAccess_GetTarget(RemoteAccess *access); -extern "C" RENDERDOC_API const char *RENDERDOC_CC RemoteAccess_GetAPI(RemoteAccess *access); -extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RemoteAccess_GetPID(RemoteAccess *access); -extern "C" RENDERDOC_API const char *RENDERDOC_CC RemoteAccess_GetBusyClient(RemoteAccess *access); +extern "C" RENDERDOC_API const char *RENDERDOC_CC TargetControl_GetTarget(TargetControl *control); +extern "C" RENDERDOC_API const char *RENDERDOC_CC TargetControl_GetAPI(TargetControl *control); +extern "C" RENDERDOC_API uint32_t RENDERDOC_CC TargetControl_GetPID(TargetControl *control); +extern "C" RENDERDOC_API const char *RENDERDOC_CC TargetControl_GetBusyClient(TargetControl *control); -extern "C" RENDERDOC_API void RENDERDOC_CC RemoteAccess_TriggerCapture(RemoteAccess *access, - uint32_t numFrames); -extern "C" RENDERDOC_API void RENDERDOC_CC RemoteAccess_QueueCapture(RemoteAccess *access, - uint32_t frameNumber); -extern "C" RENDERDOC_API void RENDERDOC_CC RemoteAccess_CopyCapture(RemoteAccess *access, - uint32_t remoteID, - const char *localpath); +extern "C" RENDERDOC_API void RENDERDOC_CC TargetControl_TriggerCapture(TargetControl *control, + uint32_t numFrames); +extern "C" RENDERDOC_API void RENDERDOC_CC TargetControl_QueueCapture(TargetControl *control, + uint32_t frameNumber); +extern "C" RENDERDOC_API void RENDERDOC_CC TargetControl_CopyCapture(TargetControl *control, + uint32_t remoteID, + const char *localpath); -extern "C" RENDERDOC_API void RENDERDOC_CC RemoteAccess_ReceiveMessage(RemoteAccess *access, - RemoteMessage *msg); +extern "C" RENDERDOC_API void RENDERDOC_CC TargetControl_ReceiveMessage(TargetControl *control, + TargetControlMessage *msg); // for C++ expose the interface as a virtual interface #ifdef __cplusplus @@ -564,15 +564,19 @@ extern "C" RENDERDOC_API ReplayCreateStatus RENDERDOC_CC RENDERDOC_CreateReplayRenderer(const char *logfile, float *progress, ReplayRenderer **rend); ////////////////////////////////////////////////////////////////////////// -// Remote access and control +// Target Control ////////////////////////////////////////////////////////////////////////// -extern "C" RENDERDOC_API RemoteAccess *RENDERDOC_CC RENDERDOC_CreateRemoteAccessConnection( +extern "C" RENDERDOC_API TargetControl *RENDERDOC_CC RENDERDOC_CreateTargetControl( const char *host, uint32_t ident, const char *clientName, bool32 forceConnection); -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); -extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_GetDefaultReplayHostPort(); +////////////////////////////////////////////////////////////////////////// +// Remote server +////////////////////////////////////////////////////////////////////////// + +extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_GetDefaultRemoteServerPort(); extern "C" RENDERDOC_API ReplayCreateStatus RENDERDOC_CC RENDERDOC_CreateRemoteReplayConnection(const char *host, uint32_t port, RemoteRenderer **rend); extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_BecomeRemoteServer(const char *listenhost, diff --git a/renderdoc/api/replay/replay_enums.h b/renderdoc/api/replay/replay_enums.h index c5a603a43..0e7258a82 100644 --- a/renderdoc/api/replay/replay_enums.h +++ b/renderdoc/api/replay/replay_enums.h @@ -497,14 +497,14 @@ enum ReplayCreateStatus eReplayCreate_APIHardwareUnsupported, }; -enum RemoteMessageType +enum TargetControlMessageType { - eRemoteMsg_Unknown = 0, - eRemoteMsg_Disconnected, - eRemoteMsg_Busy, - eRemoteMsg_Noop, - eRemoteMsg_NewCapture, - eRemoteMsg_CaptureCopied, - eRemoteMsg_RegisterAPI, - eRemoteMsg_NewChild, + eTargetControlMsg_Unknown = 0, + eTargetControlMsg_Disconnected, + eTargetControlMsg_Busy, + eTargetControlMsg_Noop, + eTargetControlMsg_NewCapture, + eTargetControlMsg_CaptureCopied, + eTargetControlMsg_RegisterAPI, + eTargetControlMsg_NewChild, }; diff --git a/renderdoc/common/globalconfig.h b/renderdoc/common/globalconfig.h index bcbdf0054..818de73c7 100644 --- a/renderdoc/common/globalconfig.h +++ b/renderdoc/common/globalconfig.h @@ -36,9 +36,9 @@ // Global constants enum { - RenderDoc_FirstCaptureNetworkPort = 38920, - RenderDoc_LastCaptureNetworkPort = RenderDoc_FirstCaptureNetworkPort + 7, - RenderDoc_ReplayNetworkPort = 39920, + RenderDoc_FirstTargetControlPort = 38920, + RenderDoc_LastTargetControlPort = RenderDoc_FirstTargetControlPort + 7, + RenderDoc_RemoteServerPort = 39920, }; ///////////////////////////////////////////////// diff --git a/renderdoc/core/core.cpp b/renderdoc/core/core.cpp index 52111c6b7..3ebc19f32 100644 --- a/renderdoc/core/core.cpp +++ b/renderdoc/core/core.cpp @@ -202,8 +202,8 @@ RenderDoc::RenderDoc() m_Overlay = eRENDERDOC_Overlay_Default; - m_RemoteServerThreadShutdown = false; - m_RemoteClientThreadShutdown = false; + m_TargetControlThreadShutdown = false; + m_ControlClientThreadShutdown = false; } void RenderDoc::Initialise() @@ -221,14 +221,14 @@ void RenderDoc::Initialise() { Process::ApplyEnvironmentModification(); - uint32_t port = RenderDoc_FirstCaptureNetworkPort; + uint32_t port = RenderDoc_FirstTargetControlPort; Network::Socket *sock = Network::CreateServerSocket("0.0.0.0", port & 0xffff, 4); while(sock == NULL) { port++; - if(port > RenderDoc_LastCaptureNetworkPort) + if(port > RenderDoc_LastTargetControlPort) { m_RemoteIdent = 0; break; @@ -241,8 +241,8 @@ void RenderDoc::Initialise() { m_RemoteIdent = port; - m_RemoteServerThreadShutdown = false; - m_RemoteThread = Threading::CreateThread(RemoteAccessServerThread, (void *)sock); + m_TargetControlThreadShutdown = false; + m_RemoteThread = Threading::CreateThread(TargetControlServerThread, (void *)sock); } } @@ -318,7 +318,7 @@ RenderDoc::~RenderDoc() if(m_RemoteThread) { - m_RemoteServerThreadShutdown = true; + m_TargetControlThreadShutdown = true; // On windows we can't join to this thread as it could lead to deadlocks, since we're // performing this destructor in the middle of module unloading. However we want to // ensure that the thread gets properly tidied up and closes its socket, so wait a little @@ -346,7 +346,7 @@ void RenderDoc::Shutdown() { // explicitly wait for thread to shutdown, this call is not from module unloading and // we want to be sure everything is gone before we remove our module & hooks - m_RemoteServerThreadShutdown = true; + m_TargetControlThreadShutdown = true; Threading::JoinThread(m_RemoteThread); Threading::CloseThread(m_RemoteThread); m_RemoteThread = 0; @@ -455,13 +455,13 @@ bool RenderDoc::EndFrameCapture(void *dev, void *wnd) return false; } -bool RenderDoc::IsRemoteAccessConnected() +bool RenderDoc::IsTargetControlConnected() { SCOPED_LOCK(RenderDoc::Inst().m_SingleClientLock); return !RenderDoc::Inst().m_SingleClientName.empty(); } -string RenderDoc::GetRemoteAccessUsername() +string RenderDoc::GetTargetControlUsername() { SCOPED_LOCK(RenderDoc::Inst().m_SingleClientLock); return RenderDoc::Inst().m_SingleClientName; diff --git a/renderdoc/core/core.h b/renderdoc/core/core.h index 0f3386cf4..ab9bbe7a6 100644 --- a/renderdoc/core/core.h +++ b/renderdoc/core/core.h @@ -248,9 +248,9 @@ public: void SetCurrentDriver(RDCDriver driver); void GetCurrentDriver(RDCDriver &driver, string &name); - uint32_t GetRemoteAccessIdent() const { return m_RemoteIdent; } - bool IsRemoteAccessConnected(); - string GetRemoteAccessUsername(); + uint32_t GetTargetControlIdent() const { return m_RemoteIdent; } + bool IsTargetControlConnected(); + string GetTargetControlUsername(); void Tick(); @@ -383,13 +383,13 @@ private: IFrameCapturer *MatchFrameCapturer(void *dev, void *wnd); - volatile bool m_RemoteServerThreadShutdown; - volatile bool m_RemoteClientThreadShutdown; + volatile bool m_TargetControlThreadShutdown; + volatile bool m_ControlClientThreadShutdown; Threading::CriticalSection m_SingleClientLock; string m_SingleClientName; - static void RemoteAccessServerThread(void *s); - static void RemoteAccessClientThread(void *s); + static void TargetControlServerThread(void *s); + static void TargetControlClientThread(void *s); ICrashHandler *m_ExHandler; }; diff --git a/renderdoc/core/remote_access.cpp b/renderdoc/core/remote_access.cpp index dd2e073a3..a61955cb2 100644 --- a/renderdoc/core/remote_access.cpp +++ b/renderdoc/core/remote_access.cpp @@ -43,7 +43,7 @@ enum PacketType ePacket_NewChild, }; -void RenderDoc::RemoteAccessClientThread(void *s) +void RenderDoc::TargetControlClientThread(void *s) { Threading::KeepModuleAlive(); @@ -85,7 +85,7 @@ void RenderDoc::RemoteAccessClientThread(void *s) while(client) { - if(RenderDoc::Inst().m_RemoteClientThreadShutdown || (client && !client->Connected())) + if(RenderDoc::Inst().m_ControlClientThreadShutdown || (client && !client->Connected())) { SAFE_DELETE(client); break; @@ -230,7 +230,7 @@ void RenderDoc::RemoteAccessClientThread(void *s) Threading::ReleaseModuleExitThread(); } -void RenderDoc::RemoteAccessServerThread(void *s) +void RenderDoc::TargetControlServerThread(void *s) { Threading::KeepModuleAlive(); @@ -240,9 +240,9 @@ void RenderDoc::RemoteAccessServerThread(void *s) Threading::ThreadHandle clientThread = 0; - RenderDoc::Inst().m_RemoteClientThreadShutdown = false; + RenderDoc::Inst().m_ControlClientThreadShutdown = false; - while(!RenderDoc::Inst().m_RemoteServerThreadShutdown) + while(!RenderDoc::Inst().m_TargetControlThreadShutdown) { Network::Socket *client = sock->AcceptClient(false); @@ -305,11 +305,11 @@ void RenderDoc::RemoteAccessServerThread(void *s) if(!existingClient.empty() && kick) { // forcibly close communication thread which will kill the connection - RenderDoc::Inst().m_RemoteClientThreadShutdown = true; + RenderDoc::Inst().m_ControlClientThreadShutdown = true; Threading::JoinThread(clientThread); Threading::CloseThread(clientThread); clientThread = 0; - RenderDoc::Inst().m_RemoteClientThreadShutdown = false; + RenderDoc::Inst().m_ControlClientThreadShutdown = false; existingClient = ""; } @@ -322,7 +322,7 @@ void RenderDoc::RemoteAccessServerThread(void *s) // if we've claimed client status, spawn a thread to communicate if(existingClient.empty() || kick) { - clientThread = Threading::CreateThread(RemoteAccessClientThread, client); + clientThread = Threading::CreateThread(TargetControlClientThread, client); continue; } else @@ -348,7 +348,7 @@ void RenderDoc::RemoteAccessServerThread(void *s) } } - RenderDoc::Inst().m_RemoteClientThreadShutdown = true; + RenderDoc::Inst().m_ControlClientThreadShutdown = true; // don't join, just close the thread, as we can't wait while in the middle of module unloading Threading::CloseThread(clientThread); clientThread = 0; @@ -358,10 +358,10 @@ void RenderDoc::RemoteAccessServerThread(void *s) Threading::ReleaseModuleExitThread(); } -struct RemoteAccess : public IRemoteAccess +struct TargetControl : public ITargetControl { public: - RemoteAccess(Network::Socket *sock, string clientName, bool forceConnection, bool localhost) + TargetControl(Network::Socket *sock, string clientName, bool forceConnection, bool localhost) : m_Socket(sock), m_Local(localhost) { PacketType type; @@ -412,7 +412,7 @@ public: SAFE_DELETE(ser); } - virtual ~RemoteAccess() {} + virtual ~TargetControl() {} bool Connected() { return m_Socket != NULL && m_Socket->Connected(); } void Shutdown() { @@ -465,11 +465,11 @@ public: m_CaptureCopies[remoteID] = localpath; } - void ReceiveMessage(RemoteMessage *msg) + void ReceiveMessage(TargetControlMessage *msg) { if(m_Socket == NULL) { - msg->Type = eRemoteMsg_Disconnected; + msg->Type = eTargetControlMsg_Disconnected; return; } @@ -478,12 +478,12 @@ public: if(!m_Socket->Connected()) { SAFE_DELETE(m_Socket); - msg->Type = eRemoteMsg_Disconnected; + msg->Type = eTargetControlMsg_Disconnected; } else { Threading::Sleep(2); - msg->Type = eRemoteMsg_Noop; + msg->Type = eTargetControlMsg_Noop; } return; @@ -498,7 +498,7 @@ public: { SAFE_DELETE(ser); - msg->Type = eRemoteMsg_Disconnected; + msg->Type = eTargetControlMsg_Disconnected; return; } else @@ -507,7 +507,7 @@ public: { SAFE_DELETE(ser); - msg->Type = eRemoteMsg_Noop; + msg->Type = eTargetControlMsg_Noop; return; } else if(type == ePacket_Busy) @@ -520,13 +520,13 @@ public: SAFE_DELETE(m_Socket); RDCLOG("Got busy signal: '%s", existingClient.c_str()); - msg->Type = eRemoteMsg_Busy; + msg->Type = eTargetControlMsg_Busy; msg->Busy.ClientName = existingClient; return; } else if(type == ePacket_CopyCapture) { - msg->Type = eRemoteMsg_CaptureCopied; + msg->Type = eTargetControlMsg_CaptureCopied; ser->Serialise("", msg->NewCapture.ID); @@ -539,7 +539,7 @@ public: SAFE_DELETE(ser); SAFE_DELETE(m_Socket); - msg->Type = eRemoteMsg_Disconnected; + msg->Type = eTargetControlMsg_Disconnected; return; } @@ -551,7 +551,7 @@ public: } else if(type == ePacket_NewChild) { - msg->Type = eRemoteMsg_NewChild; + msg->Type = eTargetControlMsg_NewChild; ser->Serialise("", msg->NewChild.PID); ser->Serialise("", msg->NewChild.ident); @@ -564,7 +564,7 @@ public: } else if(type == ePacket_NewCapture) { - msg->Type = eRemoteMsg_NewCapture; + msg->Type = eTargetControlMsg_NewCapture; ser->Serialise("", msg->NewCapture.ID); ser->Serialise("", msg->NewCapture.timestamp); @@ -594,7 +594,7 @@ public: } else if(type == ePacket_RegisterAPI) { - msg->Type = eRemoteMsg_RegisterAPI; + msg->Type = eTargetControlMsg_RegisterAPI; ser->Serialise("", m_API); msg->RegisterAPI.APIName = m_API; @@ -609,7 +609,7 @@ public: SAFE_DELETE(ser); - msg->Type = eRemoteMsg_Noop; + msg->Type = eTargetControlMsg_Noop; } private: @@ -627,52 +627,52 @@ private: } }; -extern "C" RENDERDOC_API void RENDERDOC_CC RemoteAccess_Shutdown(RemoteAccess *access) +extern "C" RENDERDOC_API void RENDERDOC_CC TargetControl_Shutdown(TargetControl *control) { - access->Shutdown(); + control->Shutdown(); } -extern "C" RENDERDOC_API const char *RENDERDOC_CC RemoteAccess_GetTarget(RemoteAccess *access) +extern "C" RENDERDOC_API const char *RENDERDOC_CC TargetControl_GetTarget(TargetControl *control) { - return access->GetTarget(); + return control->GetTarget(); } -extern "C" RENDERDOC_API const char *RENDERDOC_CC RemoteAccess_GetAPI(RemoteAccess *access) +extern "C" RENDERDOC_API const char *RENDERDOC_CC TargetControl_GetAPI(TargetControl *control) { - return access->GetAPI(); + return control->GetAPI(); } -extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RemoteAccess_GetPID(RemoteAccess *access) +extern "C" RENDERDOC_API uint32_t RENDERDOC_CC TargetControl_GetPID(TargetControl *control) { - return access->GetPID(); + return control->GetPID(); } -extern "C" RENDERDOC_API const char *RENDERDOC_CC RemoteAccess_GetBusyClient(RemoteAccess *access) +extern "C" RENDERDOC_API const char *RENDERDOC_CC TargetControl_GetBusyClient(TargetControl *control) { - return access->GetBusyClient(); + return control->GetBusyClient(); } -extern "C" RENDERDOC_API void RENDERDOC_CC RemoteAccess_TriggerCapture(RemoteAccess *access, - uint32_t numFrames) +extern "C" RENDERDOC_API void RENDERDOC_CC TargetControl_TriggerCapture(TargetControl *control, + uint32_t numFrames) { - access->TriggerCapture(numFrames); + control->TriggerCapture(numFrames); } -extern "C" RENDERDOC_API void RENDERDOC_CC RemoteAccess_QueueCapture(RemoteAccess *access, - uint32_t frameNumber) +extern "C" RENDERDOC_API void RENDERDOC_CC TargetControl_QueueCapture(TargetControl *control, + uint32_t frameNumber) { - access->QueueCapture(frameNumber); + control->QueueCapture(frameNumber); } -extern "C" RENDERDOC_API void RENDERDOC_CC RemoteAccess_CopyCapture(RemoteAccess *access, - uint32_t remoteID, - const char *localpath) +extern "C" RENDERDOC_API void RENDERDOC_CC TargetControl_CopyCapture(TargetControl *control, + uint32_t remoteID, + const char *localpath) { - access->CopyCapture(remoteID, localpath); + control->CopyCapture(remoteID, localpath); } -extern "C" RENDERDOC_API void RENDERDOC_CC RemoteAccess_ReceiveMessage(RemoteAccess *access, - RemoteMessage *msg) +extern "C" RENDERDOC_API void RENDERDOC_CC TargetControl_ReceiveMessage(TargetControl *control, + TargetControlMessage *msg) { - access->ReceiveMessage(msg); + control->ReceiveMessage(msg); } -extern "C" RENDERDOC_API RemoteAccess *RENDERDOC_CC RENDERDOC_CreateRemoteAccessConnection( +extern "C" RENDERDOC_API TargetControl *RENDERDOC_CC RENDERDOC_CreateTargetControl( const char *host, uint32_t ident, const char *clientName, bool32 forceConnection) { string s = "localhost"; @@ -686,7 +686,7 @@ extern "C" RENDERDOC_API RemoteAccess *RENDERDOC_CC RENDERDOC_CreateRemoteAccess if(sock == NULL) return NULL; - RemoteAccess *remote = new RemoteAccess(sock, clientName, forceConnection != 0, localhost); + TargetControl *remote = new TargetControl(sock, clientName, forceConnection != 0, localhost); if(remote->Connected()) return remote; diff --git a/renderdoc/core/remote_server.cpp b/renderdoc/core/remote_server.cpp index 35862639f..b3ce36c95 100644 --- a/renderdoc/core/remote_server.cpp +++ b/renderdoc/core/remote_server.cpp @@ -542,7 +542,7 @@ RENDERDOC_CreateRemoteReplayConnection(const char *host, uint32_t port, RemoteRe s = host; if(port == 0) - port = RENDERDOC_GetDefaultReplayHostPort(); + port = RENDERDOC_GetDefaultRemoteServerPort(); Network::Socket *sock = NULL; diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp index 9e3d12932..9b7ad80b3 100644 --- a/renderdoc/core/replay_proxy.cpp +++ b/renderdoc/core/replay_proxy.cpp @@ -1747,7 +1747,7 @@ void ProxySerialiser::EnsureBufCached(ResourceId bufid) bool ProxySerialiser::Tick() { - if(!m_ReplayHost) + if(!m_RemoteServer) return true; if(!m_Socket) @@ -1859,7 +1859,7 @@ bool ProxySerialiser::IsRenderOutput(ResourceId id) m_ToReplaySerialiser->Serialise("", id); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->IsRenderOutput(id); } @@ -1879,7 +1879,7 @@ APIProperties ProxySerialiser::GetAPIProperties() APIProperties ret; RDCEraseEl(ret); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->GetAPIProperties(); } @@ -1898,7 +1898,7 @@ vector ProxySerialiser::GetTextures() { vector ret; - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->GetTextures(); } @@ -1917,7 +1917,7 @@ vector ProxySerialiser::GetDebugMessages() { vector ret; - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->GetDebugMessages(); } @@ -1938,7 +1938,7 @@ FetchTexture ProxySerialiser::GetTexture(ResourceId id) m_ToReplaySerialiser->Serialise("", id); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->GetTexture(id); } @@ -1957,7 +1957,7 @@ vector ProxySerialiser::GetBuffers() { vector ret; - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->GetBuffers(); } @@ -1978,7 +1978,7 @@ FetchBuffer ProxySerialiser::GetBuffer(ResourceId id) m_ToReplaySerialiser->Serialise("", id); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->GetBuffer(id); } @@ -1995,7 +1995,7 @@ FetchBuffer ProxySerialiser::GetBuffer(ResourceId id) void ProxySerialiser::SavePipelineState() { - if(m_ReplayHost) + if(m_RemoteServer) { m_Remote->SavePipelineState(); m_D3D11PipelineState = m_Remote->GetD3D11PipelineState(); @@ -2023,7 +2023,7 @@ void ProxySerialiser::SetContextFilter(ResourceId id, uint32_t firstDefEv, uint3 m_ToReplaySerialiser->Serialise("", firstDefEv); m_ToReplaySerialiser->Serialise("", lastDefEv); - if(m_ReplayHost) + if(m_RemoteServer) { m_Remote->SetContextFilter(id, firstDefEv, lastDefEv); } @@ -2039,7 +2039,7 @@ void ProxySerialiser::ReplayLog(uint32_t endEventID, ReplayLogType replayType) m_ToReplaySerialiser->Serialise("", endEventID); m_ToReplaySerialiser->Serialise("", replayType); - if(m_ReplayHost) + if(m_RemoteServer) { m_Remote->ReplayLog(endEventID, replayType); } @@ -2059,7 +2059,7 @@ vector ProxySerialiser::GetPassEvents(uint32_t eventID) m_ToReplaySerialiser->Serialise("", eventID); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->GetPassEvents(eventID); } @@ -2080,7 +2080,7 @@ vector ProxySerialiser::GetUsage(ResourceId id) m_ToReplaySerialiser->Serialise("", id); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->GetUsage(id); } @@ -2099,7 +2099,7 @@ FetchFrameRecord ProxySerialiser::GetFrameRecord() { FetchFrameRecord ret; - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->GetFrameRecord(); } @@ -2118,9 +2118,9 @@ bool ProxySerialiser::HasCallstacks() { bool ret = false; - RDCASSERT(m_ReplayHost || m_ToReplaySerialiser->GetSize() == 0); + RDCASSERT(m_RemoteServer || m_ToReplaySerialiser->GetSize() == 0); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->HasCallstacks(); } @@ -2130,7 +2130,7 @@ bool ProxySerialiser::HasCallstacks() return ret; } - RDCASSERT(!m_ReplayHost || m_FromReplaySerialiser->GetSize() == 0); + RDCASSERT(!m_RemoteServer || m_FromReplaySerialiser->GetSize() == 0); m_FromReplaySerialiser->Serialise("", ret); @@ -2139,19 +2139,19 @@ bool ProxySerialiser::HasCallstacks() ResourceId ProxySerialiser::GetLiveID(ResourceId id) { - if(!m_ReplayHost && m_LiveIDs.find(id) != m_LiveIDs.end()) + if(!m_RemoteServer && m_LiveIDs.find(id) != m_LiveIDs.end()) return m_LiveIDs[id]; - if(!m_ReplayHost && m_LocalTextures.find(id) != m_LocalTextures.end()) + if(!m_RemoteServer && m_LocalTextures.find(id) != m_LocalTextures.end()) return id; ResourceId ret; - RDCASSERT(m_ReplayHost || m_ToReplaySerialiser->GetSize() == 0); + RDCASSERT(m_RemoteServer || m_ToReplaySerialiser->GetSize() == 0); m_ToReplaySerialiser->Serialise("", id); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->GetLiveID(id); } @@ -2161,11 +2161,11 @@ ResourceId ProxySerialiser::GetLiveID(ResourceId id) return ret; } - RDCASSERT(!m_ReplayHost || m_FromReplaySerialiser->GetSize() == 0); + RDCASSERT(!m_RemoteServer || m_FromReplaySerialiser->GetSize() == 0); m_FromReplaySerialiser->Serialise("", ret); - if(!m_ReplayHost) + if(!m_RemoteServer) m_LiveIDs[id] = ret; return ret; @@ -2177,7 +2177,7 @@ vector ProxySerialiser::FetchCounters(const vector &cou m_ToReplaySerialiser->Serialise("", (vector &)counters); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->FetchCounters(counters); } @@ -2196,7 +2196,7 @@ vector ProxySerialiser::EnumerateCounters() { vector ret; - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->EnumerateCounters(); } @@ -2215,7 +2215,7 @@ void ProxySerialiser::DescribeCounter(uint32_t counterID, CounterDescription &de { m_ToReplaySerialiser->Serialise("", counterID); - if(m_ReplayHost) + if(m_RemoteServer) { m_Remote->DescribeCounter(counterID, desc); } @@ -2239,7 +2239,7 @@ void ProxySerialiser::FillCBufferVariables(ResourceId shader, string entryPoint, m_ToReplaySerialiser->Serialise("", outvars); m_ToReplaySerialiser->Serialise("", (vector &)data); - if(m_ReplayHost) + if(m_RemoteServer) { m_Remote->FillCBufferVariables(shader, entryPoint, cbufSlot, outvars, data); } @@ -2261,7 +2261,7 @@ void ProxySerialiser::GetBufferData(ResourceId buff, uint64_t offset, uint64_t l m_ToReplaySerialiser->Serialise("", offset); m_ToReplaySerialiser->Serialise("", len); - if(m_ReplayHost) + if(m_RemoteServer) { m_Remote->GetBufferData(buff, offset, len, retData); @@ -2295,7 +2295,7 @@ byte *ProxySerialiser::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_ m_ToReplaySerialiser->Serialise("", blackPoint); m_ToReplaySerialiser->Serialise("", whitePoint); - if(m_ReplayHost) + if(m_RemoteServer) { byte *data = m_Remote->GetTextureData(tex, arrayIdx, mip, typeHint, resolve, forceRGBA8unorm, blackPoint, whitePoint, dataSize); @@ -2338,7 +2338,7 @@ void ProxySerialiser::InitPostVSBuffers(uint32_t eventID) { m_ToReplaySerialiser->Serialise("", eventID); - if(m_ReplayHost) + if(m_RemoteServer) { m_Remote->InitPostVSBuffers(eventID); } @@ -2353,7 +2353,7 @@ void ProxySerialiser::InitPostVSBuffers(const vector &events) { m_ToReplaySerialiser->Serialise("", (vector &)events); - if(m_ReplayHost) + if(m_RemoteServer) { m_Remote->InitPostVSBuffers(events); } @@ -2372,7 +2372,7 @@ MeshFormat ProxySerialiser::GetPostVSBuffers(uint32_t eventID, uint32_t instID, m_ToReplaySerialiser->Serialise("", instID); m_ToReplaySerialiser->Serialise("", stage); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->GetPostVSBuffers(eventID, instID, stage); } @@ -2401,7 +2401,7 @@ ResourceId ProxySerialiser::RenderOverlay(ResourceId texid, FormatComponentType m_ToReplaySerialiser->Serialise("", eventID); m_ToReplaySerialiser->Serialise("", events); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->RenderOverlay(texid, typeHint, overlay, eventID, events); } @@ -2418,7 +2418,7 @@ ResourceId ProxySerialiser::RenderOverlay(ResourceId texid, FormatComponentType ShaderReflection *ProxySerialiser::GetShader(ResourceId id, string entryPoint) { - if(m_ReplayHost) + if(m_RemoteServer) { m_ToReplaySerialiser->Serialise("", id); m_ToReplaySerialiser->Serialise("", entryPoint); @@ -2466,7 +2466,7 @@ void ProxySerialiser::FreeTargetResource(ResourceId id) { m_ToReplaySerialiser->Serialise("", id); - if(m_ReplayHost) + if(m_RemoteServer) { m_Remote->FreeTargetResource(id); } @@ -2479,7 +2479,7 @@ void ProxySerialiser::FreeTargetResource(ResourceId id) void ProxySerialiser::InitCallstackResolver() { - if(m_ReplayHost) + if(m_RemoteServer) { m_Remote->InitCallstackResolver(); } @@ -2497,7 +2497,7 @@ Callstack::StackResolver *ProxySerialiser::GetCallstackResolver() bool remoteHasResolver = false; - if(m_ReplayHost) + if(m_RemoteServer) { remoteHasResolver = m_Remote->GetCallstackResolver() != NULL; } @@ -2511,7 +2511,7 @@ Callstack::StackResolver *ProxySerialiser::GetCallstackResolver() if(remoteHasResolver) { - if(!m_ReplayHost) + if(!m_RemoteServer) m_RemoteHasResolver = true; return this; @@ -2524,7 +2524,7 @@ Callstack::AddressDetails ProxySerialiser::GetAddr(uint64_t addr) { Callstack::AddressDetails ret; - if(m_ReplayHost) + if(m_RemoteServer) { Callstack::StackResolver *resolv = m_Remote->GetCallstackResolver(); if(resolv) @@ -2555,7 +2555,7 @@ void ProxySerialiser::BuildTargetShader(string source, string entry, const uint3 ResourceId outId; string outErrs; - if(m_ReplayHost) + if(m_RemoteServer) { m_Remote->BuildTargetShader(source, entry, flags, type, &outId, &outErrs); } @@ -2568,7 +2568,7 @@ void ProxySerialiser::BuildTargetShader(string source, string entry, const uint3 m_FromReplaySerialiser->Serialise("", outId); m_FromReplaySerialiser->Serialise("", outErrs); - if(!m_ReplayHost) + if(!m_RemoteServer) { if(id) *id = outId; @@ -2582,7 +2582,7 @@ void ProxySerialiser::ReplaceResource(ResourceId from, ResourceId to) m_ToReplaySerialiser->Serialise("", from); m_ToReplaySerialiser->Serialise("", to); - if(m_ReplayHost) + if(m_RemoteServer) { m_Remote->ReplaceResource(from, to); } @@ -2597,7 +2597,7 @@ void ProxySerialiser::RemoveReplacement(ResourceId id) { m_ToReplaySerialiser->Serialise("", id); - if(m_ReplayHost) + if(m_RemoteServer) { m_Remote->RemoveReplacement(id); } @@ -2624,7 +2624,7 @@ vector ProxySerialiser::PixelHistory(vector event m_ToReplaySerialiser->Serialise("", sampleIdx); m_ToReplaySerialiser->Serialise("", typeHint); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->PixelHistory(events, target, x, y, slice, mip, sampleIdx, typeHint); } @@ -2651,7 +2651,7 @@ ShaderDebugTrace ProxySerialiser::DebugVertex(uint32_t eventID, uint32_t vertid, m_ToReplaySerialiser->Serialise("", instOffset); m_ToReplaySerialiser->Serialise("", vertOffset); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->DebugVertex(eventID, vertid, instid, idx, instOffset, vertOffset); } @@ -2677,7 +2677,7 @@ ShaderDebugTrace ProxySerialiser::DebugPixel(uint32_t eventID, uint32_t x, uint3 m_ToReplaySerialiser->Serialise("", sample); m_ToReplaySerialiser->Serialise("", primitive); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->DebugPixel(eventID, x, y, sample, primitive); } @@ -2701,7 +2701,7 @@ ShaderDebugTrace ProxySerialiser::DebugThread(uint32_t eventID, uint32_t groupid m_ToReplaySerialiser->SerialisePODArray<3>("", groupid); m_ToReplaySerialiser->SerialisePODArray<3>("", threadid); - if(m_ReplayHost) + if(m_RemoteServer) { ret = m_Remote->DebugThread(eventID, groupid, threadid); } diff --git a/renderdoc/core/replay_proxy.h b/renderdoc/core/replay_proxy.h index 6c7061ce9..9910ce85b 100644 --- a/renderdoc/core/replay_proxy.h +++ b/renderdoc/core/replay_proxy.h @@ -98,7 +98,7 @@ class ProxySerialiser : public IReplayDriver, Callstack::StackResolver { public: ProxySerialiser(Network::Socket *sock, IReplayDriver *proxy) - : m_Socket(sock), m_Proxy(proxy), m_Remote(NULL), m_ReplayHost(false) + : m_Socket(sock), m_Proxy(proxy), m_Remote(NULL), m_RemoteServer(false) { m_FromReplaySerialiser = NULL; m_ToReplaySerialiser = new Serialiser(NULL, Serialiser::WRITING, false); @@ -106,7 +106,7 @@ public: } ProxySerialiser(Network::Socket *sock, IRemoteDriver *remote) - : m_Socket(sock), m_Proxy(NULL), m_Remote(remote), m_ReplayHost(true) + : m_Socket(sock), m_Proxy(NULL), m_Remote(remote), m_RemoteServer(true) { m_ToReplaySerialiser = NULL; m_FromReplaySerialiser = new Serialiser(NULL, Serialiser::WRITING, false); @@ -115,7 +115,7 @@ public: virtual ~ProxySerialiser(); - bool IsRemoteProxy() { return !m_ReplayHost; } + bool IsRemoteProxy() { return !m_RemoteServer; } void Shutdown() { delete this; } void ReadLogInitialisation() {} vector GetSupportedWindowSystems() @@ -490,7 +490,7 @@ private: Serialiser *m_ToReplaySerialiser; IReplayDriver *m_Proxy; IRemoteDriver *m_Remote; - bool m_ReplayHost; + bool m_RemoteServer; bool m_RemoteHasResolver; diff --git a/renderdoc/driver/d3d11/d3d11_device.cpp b/renderdoc/driver/d3d11/d3d11_device.cpp index 641c42d16..70c5b1555 100644 --- a/renderdoc/driver/d3d11/d3d11_device.cpp +++ b/renderdoc/driver/d3d11/d3d11_device.cpp @@ -3200,8 +3200,8 @@ HRESULT WrappedID3D11Device::Present(WrappedIDXGISwapChain3 *swap, UINT SyncInte } else { - if(RenderDoc::Inst().IsRemoteAccessConnected()) - overlayText += "Connected by " + RenderDoc::Inst().GetRemoteAccessUsername() + "."; + if(RenderDoc::Inst().IsTargetControlConnected()) + overlayText += "Connected by " + RenderDoc::Inst().GetTargetControlUsername() + "."; else overlayText += "No remote access connection."; } diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp index ee19dbeaa..e6d46cd9d 100644 --- a/renderdoc/driver/d3d12/d3d12_device.cpp +++ b/renderdoc/driver/d3d12/d3d12_device.cpp @@ -762,8 +762,8 @@ HRESULT WrappedID3D12Device::Present(WrappedIDXGISwapChain3 *swap, UINT SyncInte } else { - if(RenderDoc::Inst().IsRemoteAccessConnected()) - overlayText += "Connected by " + RenderDoc::Inst().GetRemoteAccessUsername() + "."; + if(RenderDoc::Inst().IsTargetControlConnected()) + overlayText += "Connected by " + RenderDoc::Inst().GetTargetControlUsername() + "."; else overlayText += "No remote access connection."; } diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index 0c5846ee1..b9d47fbbb 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -2251,8 +2251,8 @@ void WrappedOpenGL::SwapBuffers(void *windowHandle) } else { - if(RenderDoc::Inst().IsRemoteAccessConnected()) - overlayText += "Connected by " + RenderDoc::Inst().GetRemoteAccessUsername() + "."; + if(RenderDoc::Inst().IsTargetControlConnected()) + overlayText += "Connected by " + RenderDoc::Inst().GetTargetControlUsername() + "."; else overlayText += "No remote access connection."; } diff --git a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp index ac2c88042..989ffdc37 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp @@ -619,13 +619,13 @@ VkResult WrappedVulkan::vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR } else { - if(RenderDoc::Inst().IsRemoteAccessConnected()) + if(RenderDoc::Inst().IsTargetControlConnected()) { - overlayText += "Connected by " + RenderDoc::Inst().GetRemoteAccessUsername() + "."; + overlayText += "Connected by " + RenderDoc::Inst().GetTargetControlUsername() + "."; } else { - uint32_t port = RenderDoc::Inst().GetRemoteAccessIdent(); + uint32_t port = RenderDoc::Inst().GetTargetControlIdent(); if(port) overlayText += StringFormat::Fmt("Listening for remote access connection on port %i.", port); diff --git a/renderdoc/os/posix/android/android_process.cpp b/renderdoc/os/posix/android/android_process.cpp index a573b9dd1..b4a6806c0 100644 --- a/renderdoc/os/posix/android/android_process.cpp +++ b/renderdoc/os/posix/android/android_process.cpp @@ -64,8 +64,8 @@ int GetIdentPort(pid_t childPid) int num = sscanf(line, " %d: %x:%x", &socketnum, &hexip, &hexport); // find open listen socket on 0.0.0.0:port - if(num == 3 && hexip == 0 && hexport >= RenderDoc_FirstCaptureNetworkPort && - hexport <= RenderDoc_LastCaptureNetworkPort) + if(num == 3 && hexip == 0 && hexport >= RenderDoc_FirstTargetControlPort && + hexport <= RenderDoc_LastTargetControlPort) { ret = hexport; break; diff --git a/renderdoc/os/posix/apple/apple_process.cpp b/renderdoc/os/posix/apple/apple_process.cpp index a8318156f..3fb4a1b50 100644 --- a/renderdoc/os/posix/apple/apple_process.cpp +++ b/renderdoc/os/posix/apple/apple_process.cpp @@ -108,7 +108,7 @@ int GetIdentPort(pid_t childPid) } const int port = std::stoi(portStr); - if(port >= RenderDoc_FirstCaptureNetworkPort && port <= RenderDoc_LastCaptureNetworkPort) + if(port >= RenderDoc_FirstTargetControlPort && port <= RenderDoc_LastTargetControlPort) { return port; } diff --git a/renderdoc/os/posix/linux/linux_process.cpp b/renderdoc/os/posix/linux/linux_process.cpp index 27f4352dc..26b3d0a7f 100644 --- a/renderdoc/os/posix/linux/linux_process.cpp +++ b/renderdoc/os/posix/linux/linux_process.cpp @@ -64,8 +64,8 @@ int GetIdentPort(pid_t childPid) int num = sscanf(line, " %d: %x:%x", &socketnum, &hexip, &hexport); // find open listen socket on 0.0.0.0:port - if(num == 3 && hexip == 0 && hexport >= RenderDoc_FirstCaptureNetworkPort && - hexport <= RenderDoc_LastCaptureNetworkPort) + if(num == 3 && hexip == 0 && hexport >= RenderDoc_FirstTargetControlPort && + hexport <= RenderDoc_LastTargetControlPort) { ret = hexport; break; diff --git a/renderdoc/os/win32/win32_process.cpp b/renderdoc/os/win32/win32_process.cpp index eeed7a73b..a61a070d2 100644 --- a/renderdoc/os/win32/win32_process.cpp +++ b/renderdoc/os/win32/win32_process.cpp @@ -133,10 +133,10 @@ void Process::ApplyEnvironmentModification() } // helpers for various shims and dlls etc, not part of the public API -extern "C" __declspec(dllexport) void __cdecl RENDERDOC_GetRemoteAccessIdent(uint32_t *ident) +extern "C" __declspec(dllexport) void __cdecl RENDERDOC_GetTargetControlIdent(uint32_t *ident) { if(ident) - *ident = RenderDoc::Inst().GetRemoteAccessIdent(); + *ident = RenderDoc::Inst().GetTargetControlIdent(); } extern "C" __declspec(dllexport) void __cdecl RENDERDOC_SetCaptureOptions(CaptureOptions *opts) @@ -521,7 +521,7 @@ uint32_t Process::InjectIntoProcess(uint32_t pid, const char *logfile, const Cap uintptr_t loc = FindRemoteDLL(pid, L"renderdoc.dll"); - uint32_t remoteident = 0; + uint32_t controlident = 0; if(loc == 0) { @@ -538,8 +538,8 @@ uint32_t Process::InjectIntoProcess(uint32_t pid, const char *logfile, const Cap InjectFunctionCall(hProcess, loc, "RENDERDOC_SetCaptureOptions", (CaptureOptions *)opts, sizeof(CaptureOptions)); - InjectFunctionCall(hProcess, loc, "RENDERDOC_GetRemoteAccessIdent", &remoteident, - sizeof(remoteident)); + InjectFunctionCall(hProcess, loc, "RENDERDOC_GetTargetControlIdent", &controlident, + sizeof(controlident)); } if(waitForExit) @@ -547,7 +547,7 @@ uint32_t Process::InjectIntoProcess(uint32_t pid, const char *logfile, const Cap CloseHandle(hProcess); - return remoteident; + return controlident; } uint32_t Process::LaunchProcess(const char *app, const char *workingDir, const char *cmdLine) diff --git a/renderdoc/replay/app_api.cpp b/renderdoc/replay/app_api.cpp index aed497277..212e34257 100644 --- a/renderdoc/replay/app_api.cpp +++ b/renderdoc/replay/app_api.cpp @@ -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 diff --git a/renderdoc/replay/entry_points.cpp b/renderdoc/replay/entry_points.cpp index 8f55b0d8d..ecb41a8b3 100644 --- a/renderdoc/replay/entry_points.cpp +++ b/renderdoc/replay/entry_points.cpp @@ -424,8 +424,8 @@ extern "C" RENDERDOC_API void *RENDERDOC_CC RENDERDOC_AllocArrayMem(uint64_t sz) return rdctype::array::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); } diff --git a/renderdoccmd/renderdoccmd.cpp b/renderdoccmd/renderdoccmd.cpp index c65dee0e3..6f06c94c4 100644 --- a/renderdoccmd/renderdoccmd.cpp +++ b/renderdoccmd/renderdoccmd.cpp @@ -393,7 +393,7 @@ struct RemoteServerCommand : public Command parser.add( "host", 'h', "The interface to listen on. By default listens on all interfaces", false, ""); parser.add("port", 'p', "The port to listen on.", false, - RENDERDOC_GetDefaultReplayHostPort()); + RENDERDOC_GetDefaultRemoteServerPort()); } virtual const char *Description() { @@ -429,7 +429,7 @@ struct ReplayCommand : public Command parser.add("remote-host", 0, "Instead of replaying locally, replay on this host over the network.", false); parser.add("remote-port", 0, "If --remote-host is set, use this port.", false, - RENDERDOC_GetDefaultReplayHostPort()); + RENDERDOC_GetDefaultRemoteServerPort()); } virtual const char *Description() { diff --git a/renderdocui/Code/AppMain.cs b/renderdocui/Code/AppMain.cs index e3d1f3a2a..842b8d80a 100644 --- a/renderdocui/Code/AppMain.cs +++ b/renderdocui/Code/AppMain.cs @@ -100,7 +100,10 @@ namespace renderdocui.Code for (int i = 0; i < args.Length; i++) { - if (args[i].ToUpperInvariant() == "--REMOTEACCESS" && i + 1 < args.Length) + // accept --remoteaccess for backwards compatibility + if (i + 1 < args.Length && + (args[i].ToUpperInvariant() == "--REMOTEACCESS" || + args[i].ToUpperInvariant() == "--TARGETCONTROL")) { var regexp = @"^([a-zA-Z0-9_-]+:)?([0-9]+)$"; diff --git a/renderdocui/Interop/Enums.cs b/renderdocui/Interop/Enums.cs index 40965c864..cf6a0f5f1 100644 --- a/renderdocui/Interop/Enums.cs +++ b/renderdocui/Interop/Enums.cs @@ -508,7 +508,7 @@ namespace renderdoc APIHardwareUnsupported, }; - public enum RemoteMessageType + public enum TargetControlMessageType { Unknown = 0, Disconnected, diff --git a/renderdocui/Interop/ReplayRenderer.cs b/renderdocui/Interop/ReplayRenderer.cs index 26e2fce72..7261a5c2f 100644 --- a/renderdocui/Interop/ReplayRenderer.cs +++ b/renderdocui/Interop/ReplayRenderer.cs @@ -30,9 +30,9 @@ using System.Collections.Generic; namespace renderdoc { [StructLayout(LayoutKind.Sequential)] - public class RemoteMessage + public class TargetControlMessage { - public RemoteMessageType Type; + public TargetControlMessageType Type; [StructLayout(LayoutKind.Sequential)] public struct NewCaptureData @@ -919,29 +919,29 @@ namespace renderdoc } }; - public class RemoteAccess + public class TargetControl { [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern void RemoteAccess_Shutdown(IntPtr real); + private static extern void TargetControl_Shutdown(IntPtr real); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern IntPtr RemoteAccess_GetTarget(IntPtr real); + private static extern IntPtr TargetControl_GetTarget(IntPtr real); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern IntPtr RemoteAccess_GetAPI(IntPtr real); + private static extern IntPtr TargetControl_GetAPI(IntPtr real); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern UInt32 RemoteAccess_GetPID(IntPtr real); + private static extern UInt32 TargetControl_GetPID(IntPtr real); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern IntPtr RemoteAccess_GetBusyClient(IntPtr real); + private static extern IntPtr TargetControl_GetBusyClient(IntPtr real); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern void RemoteAccess_TriggerCapture(IntPtr real, UInt32 numFrames); + private static extern void TargetControl_TriggerCapture(IntPtr real, UInt32 numFrames); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern void RemoteAccess_QueueCapture(IntPtr real, UInt32 frameNumber); + private static extern void TargetControl_QueueCapture(IntPtr real, UInt32 frameNumber); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern void RemoteAccess_CopyCapture(IntPtr real, UInt32 remoteID, IntPtr localpath); + private static extern void TargetControl_CopyCapture(IntPtr real, UInt32 remoteID, IntPtr localpath); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern void RemoteAccess_ReceiveMessage(IntPtr real, IntPtr outmsg); + private static extern void TargetControl_ReceiveMessage(IntPtr real, IntPtr outmsg); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] private static extern UInt32 RENDERDOC_EnumerateRemoteConnections(IntPtr host, UInt32[] idents); @@ -949,7 +949,7 @@ namespace renderdoc private IntPtr m_Real = IntPtr.Zero; private bool m_Connected; - public RemoteAccess(IntPtr real) + public TargetControl(IntPtr real) { m_Real = real; @@ -963,10 +963,10 @@ namespace renderdoc else { m_Connected = true; - Target = CustomMarshal.PtrToStringUTF8(RemoteAccess_GetTarget(m_Real)); - API = CustomMarshal.PtrToStringUTF8(RemoteAccess_GetAPI(m_Real)); - PID = RemoteAccess_GetPID(m_Real); - BusyClient = CustomMarshal.PtrToStringUTF8(RemoteAccess_GetBusyClient(m_Real)); + Target = CustomMarshal.PtrToStringUTF8(TargetControl_GetTarget(m_Real)); + API = CustomMarshal.PtrToStringUTF8(TargetControl_GetAPI(m_Real)); + PID = TargetControl_GetPID(m_Real); + BusyClient = CustomMarshal.PtrToStringUTF8(TargetControl_GetBusyClient(m_Real)); } CaptureExists = false; @@ -994,25 +994,25 @@ namespace renderdoc public void Shutdown() { m_Connected = false; - if (m_Real != IntPtr.Zero) RemoteAccess_Shutdown(m_Real); + if (m_Real != IntPtr.Zero) TargetControl_Shutdown(m_Real); m_Real = IntPtr.Zero; } public void TriggerCapture(UInt32 numFrames) { - RemoteAccess_TriggerCapture(m_Real, numFrames); + TargetControl_TriggerCapture(m_Real, numFrames); } public void QueueCapture(UInt32 frameNum) { - RemoteAccess_QueueCapture(m_Real, frameNum); + TargetControl_QueueCapture(m_Real, frameNum); } public void CopyCapture(UInt32 id, string localpath) { IntPtr localpath_mem = CustomMarshal.MakeUTF8String(localpath); - RemoteAccess_CopyCapture(m_Real, id, localpath_mem); + TargetControl_CopyCapture(m_Real, id, localpath_mem); CustomMarshal.Free(localpath_mem); } @@ -1021,42 +1021,42 @@ namespace renderdoc { if (m_Real != IntPtr.Zero) { - RemoteMessage msg = null; + TargetControlMessage msg = null; { - IntPtr mem = CustomMarshal.Alloc(typeof(RemoteMessage)); + IntPtr mem = CustomMarshal.Alloc(typeof(TargetControlMessage)); - RemoteAccess_ReceiveMessage(m_Real, mem); + TargetControl_ReceiveMessage(m_Real, mem); if (mem != IntPtr.Zero) - msg = (RemoteMessage)CustomMarshal.PtrToStructure(mem, typeof(RemoteMessage), true); + msg = (TargetControlMessage)CustomMarshal.PtrToStructure(mem, typeof(TargetControlMessage), true); CustomMarshal.Free(mem); } - if (msg.Type == RemoteMessageType.Disconnected) + if (msg.Type == TargetControlMessageType.Disconnected) { m_Connected = false; - RemoteAccess_Shutdown(m_Real); + TargetControl_Shutdown(m_Real); m_Real = IntPtr.Zero; } - else if (msg.Type == RemoteMessageType.NewCapture) + else if (msg.Type == TargetControlMessageType.NewCapture) { CaptureFile = msg.NewCapture; CaptureExists = true; } - else if (msg.Type == RemoteMessageType.CaptureCopied) + else if (msg.Type == TargetControlMessageType.CaptureCopied) { CaptureFile.ID = msg.NewCapture.ID; CaptureFile.localpath = msg.NewCapture.localpath; CaptureCopied = true; } - else if (msg.Type == RemoteMessageType.RegisterAPI) + else if (msg.Type == TargetControlMessageType.RegisterAPI) { API = msg.RegisterAPI.APIName; InfoUpdated = true; } - else if (msg.Type == RemoteMessageType.NewChild) + else if (msg.Type == TargetControlMessageType.NewChild) { NewChild = msg.NewChild; ChildAdded = true; @@ -1074,8 +1074,8 @@ namespace renderdoc public bool CaptureCopied; public bool InfoUpdated; - public RemoteMessage.NewCaptureData CaptureFile = new RemoteMessage.NewCaptureData(); + public TargetControlMessage.NewCaptureData CaptureFile = new TargetControlMessage.NewCaptureData(); - public RemoteMessage.NewChildData NewChild = new RemoteMessage.NewChildData(); + public TargetControlMessage.NewChildData NewChild = new TargetControlMessage.NewChildData(); }; }; diff --git a/renderdocui/Interop/StaticExports.cs b/renderdocui/Interop/StaticExports.cs index d428ae707..9d8f2f391 100644 --- a/renderdocui/Interop/StaticExports.cs +++ b/renderdocui/Interop/StaticExports.cs @@ -48,10 +48,10 @@ namespace renderdoc private static extern UInt32 RENDERDOC_InjectIntoProcess(UInt32 pid, IntPtr logfile, CaptureOptions opts, bool waitForExit); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern IntPtr RENDERDOC_CreateRemoteAccessConnection(IntPtr host, UInt32 ident, IntPtr clientName, bool forceConnection); + private static extern IntPtr RENDERDOC_CreateTargetControl(IntPtr host, UInt32 ident, IntPtr clientName, bool forceConnection); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern UInt32 RENDERDOC_EnumerateRemoteConnections(IntPtr host, UInt32 nextIdent); + private static extern UInt32 RENDERDOC_EnumerateRemoteTargets(IntPtr host, UInt32 nextIdent); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] private static extern ReplayCreateStatus RENDERDOC_CreateRemoteReplayConnection(IntPtr host, UInt32 port, ref IntPtr outrend); @@ -158,12 +158,12 @@ namespace renderdoc return ret; } - public static RemoteAccess CreateRemoteAccessConnection(string host, UInt32 ident, string clientName, bool forceConnection) + public static TargetControl CreateTargetControl(string host, UInt32 ident, string clientName, bool forceConnection) { IntPtr host_mem = CustomMarshal.MakeUTF8String(host); IntPtr clientName_mem = CustomMarshal.MakeUTF8String(clientName); - IntPtr rendPtr = RENDERDOC_CreateRemoteAccessConnection(host_mem, ident, clientName_mem, forceConnection); + IntPtr rendPtr = RENDERDOC_CreateTargetControl(host_mem, ident, clientName_mem, forceConnection); CustomMarshal.Free(host_mem); CustomMarshal.Free(clientName_mem); @@ -175,12 +175,12 @@ namespace renderdoc throw e; } - return new RemoteAccess(rendPtr); + return new TargetControl(rendPtr); } public delegate void RemoteConnectionFound(UInt32 ident); - public static void EnumerateRemoteConnections(string host, RemoteConnectionFound callback) + public static void EnumerateRemoteTargets(string host, RemoteConnectionFound callback) { IntPtr host_mem = CustomMarshal.MakeUTF8String(host); @@ -191,7 +191,7 @@ namespace renderdoc // just a sanity check to make sure we don't hit some unexpected case UInt32 prevIdent = nextIdent; - nextIdent = RENDERDOC_EnumerateRemoteConnections(host_mem, nextIdent); + nextIdent = RENDERDOC_EnumerateRemoteTargets(host_mem, nextIdent); if (nextIdent == UInt32.MaxValue || prevIdent >= nextIdent) break; diff --git a/renderdocui/Windows/Dialogs/LiveCapture.cs b/renderdocui/Windows/Dialogs/LiveCapture.cs index bfea92872..2333923d3 100644 --- a/renderdocui/Windows/Dialogs/LiveCapture.cs +++ b/renderdocui/Windows/Dialogs/LiveCapture.cs @@ -58,7 +58,7 @@ namespace renderdocui.Windows int m_CaptureFrameNum = 0; int m_CaptureCounter = 0; bool m_Disconnect = false; - RemoteAccess m_Connection = null; + TargetControl m_Connection = null; bool m_IgnoreThreadClosed = false; @@ -145,7 +145,7 @@ namespace renderdocui.Windows { string username = System.Security.Principal.WindowsIdentity.GetCurrent().Name; - m_Connection = StaticExports.CreateRemoteAccessConnection(m_Host, m_RemoteIdent, username, true); + m_Connection = StaticExports.CreateTargetControl(m_Host, m_RemoteIdent, username, true); if (m_Connection.Connected) { diff --git a/renderdocui/Windows/Dialogs/RemoteHostSelect.cs b/renderdocui/Windows/Dialogs/RemoteHostSelect.cs index 404b34eef..789084eef 100644 --- a/renderdocui/Windows/Dialogs/RemoteHostSelect.cs +++ b/renderdocui/Windows/Dialogs/RemoteHostSelect.cs @@ -121,10 +121,10 @@ namespace renderdocui.Windows.Dialogs string username = System.Security.Principal.WindowsIdentity.GetCurrent().Name; - StaticExports.EnumerateRemoteConnections(hostname, (UInt32 i) => { + StaticExports.EnumerateRemoteTargets(hostname, (UInt32 i) => { try { - var conn = StaticExports.CreateRemoteAccessConnection(hostname, i, username, false); + var conn = StaticExports.CreateTargetControl(hostname, i, username, false); if (node.OwnerView.Visible) { diff --git a/renderdocui/Windows/Dialogs/UpdateDialog.cs b/renderdocui/Windows/Dialogs/UpdateDialog.cs index f3e8f6fa4..9f1c963a8 100644 --- a/renderdocui/Windows/Dialogs/UpdateDialog.cs +++ b/renderdocui/Windows/Dialogs/UpdateDialog.cs @@ -72,11 +72,11 @@ namespace renderdocui.Windows.Dialogs string runningPrograms = ""; int running = 0; - renderdoc.StaticExports.EnumerateRemoteConnections("localhost", (UInt32 i) => + renderdoc.StaticExports.EnumerateRemoteTargets("localhost", (UInt32 i) => { running++; - var conn = renderdoc.StaticExports.CreateRemoteAccessConnection("localhost", i, "updater", false); + var conn = renderdoc.StaticExports.CreateTargetControl("localhost", i, "updater", false); if (runningPrograms != "") runningPrograms += "\n";