From 4e450dbfcc8845829980b6b761257567a0f2cce1 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 2 Aug 2016 19:08:15 +0200 Subject: [PATCH] Rename RemoteRenderer to RemoteServer --- qrenderdoc/Code/RenderManager.cpp | 4 ++-- renderdoc/api/replay/renderdoc_replay.h | 20 ++++++++++---------- renderdoc/core/remote_server.cpp | 18 +++++++++--------- renderdocui/Code/RenderManager.cs | 4 ++-- renderdocui/Interop/ReplayRenderer.cs | 20 ++++++++++---------- renderdocui/Interop/StaticExports.cs | 4 ++-- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/qrenderdoc/Code/RenderManager.cpp b/qrenderdoc/Code/RenderManager.cpp index 9694a8f2f..c73030b2e 100644 --- a/qrenderdoc/Code/RenderManager.cpp +++ b/qrenderdoc/Code/RenderManager.cpp @@ -90,7 +90,7 @@ void RenderManager::PushInvoke(RenderManager::InvokeHandle *cmd) void RenderManager::run() { IReplayRenderer *renderer = NULL; - IRemoteRenderer *remote = NULL; + IRemoteServer *remote = NULL; if(m_ProxyRenderer < 0) { @@ -98,7 +98,7 @@ void RenderManager::run() } else { - m_CreateStatus = RENDERDOC_CreateRemoteReplayConnection(m_ReplayHost.toUtf8(), 0, &remote); + m_CreateStatus = RENDERDOC_CreateRemoteServerConnection(m_ReplayHost.toUtf8(), 0, &remote); if(remote == NULL) { diff --git a/renderdoc/api/replay/renderdoc_replay.h b/renderdoc/api/replay/renderdoc_replay.h index 38f315504..eda40f80c 100644 --- a/renderdoc/api/replay/renderdoc_replay.h +++ b/renderdoc/api/replay/renderdoc_replay.h @@ -474,7 +474,7 @@ extern "C" RENDERDOC_API void RENDERDOC_CC TargetControl_ReceiveMessage(TargetCo // for C++ expose the interface as a virtual interface #ifdef __cplusplus -struct IRemoteRenderer +struct IRemoteServer { virtual void Shutdown() = 0; @@ -488,27 +488,27 @@ struct IRemoteRenderer #endif #ifdef RENDERDOC_EXPORTS -struct RemoteRenderer; +struct RemoteServer; #else #ifdef __cplusplus -typedef IRemoteRenderer RemoteRenderer; +typedef IRemoteServer RemoteServer; #else -struct RemoteRenderer +struct RemoteServer { }; #endif #endif -extern "C" RENDERDOC_API void RENDERDOC_CC RemoteRenderer_Shutdown(RemoteRenderer *remote); +extern "C" RENDERDOC_API void RENDERDOC_CC RemoteServer_Shutdown(RemoteServer *remote); extern "C" RENDERDOC_API bool32 RENDERDOC_CC -RemoteRenderer_LocalProxies(RemoteRenderer *remote, rdctype::array *out); +RemoteServer_LocalProxies(RemoteServer *remote, rdctype::array *out); extern "C" RENDERDOC_API bool32 RENDERDOC_CC -RemoteRenderer_RemoteSupportedReplays(RemoteRenderer *remote, rdctype::array *out); +RemoteServer_RemoteSupportedReplays(RemoteServer *remote, rdctype::array *out); extern "C" RENDERDOC_API ReplayCreateStatus RENDERDOC_CC -RemoteRenderer_CreateProxyRenderer(RemoteRenderer *remote, uint32_t proxyid, const char *logfile, - float *progress, ReplayRenderer **rend); +RemoteServer_CreateProxyRenderer(RemoteServer *remote, uint32_t proxyid, const char *logfile, + float *progress, ReplayRenderer **rend); ////////////////////////////////////////////////////////////////////////// // camera @@ -578,7 +578,7 @@ extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_EnumerateRemoteTargets( 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); +RENDERDOC_CreateRemoteServerConnection(const char *host, uint32_t port, RemoteServer **rend); extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_BecomeRemoteServer(const char *listenhost, uint32_t port, volatile bool32 *killReplay); diff --git a/renderdoc/core/remote_server.cpp b/renderdoc/core/remote_server.cpp index 3c0c4677c..f5778bfd6 100644 --- a/renderdoc/core/remote_server.cpp +++ b/renderdoc/core/remote_server.cpp @@ -345,10 +345,10 @@ void RenderDoc::BecomeRemoteServer(const char *listenhost, uint16_t port, volati SAFE_DELETE(sock); } -struct RemoteRenderer : public IRemoteRenderer +struct RemoteServer : public IRemoteServer { public: - RemoteRenderer(Network::Socket *sock) : m_Socket(sock) + RemoteServer(Network::Socket *sock) : m_Socket(sock) { map m = RenderDoc::Inst().GetReplayDrivers(); @@ -386,7 +386,7 @@ public: for(auto it = m.begin(); it != m.end(); ++it) m_RemoteDrivers.push_back(*it); } - virtual ~RemoteRenderer() { SAFE_DELETE(m_Socket); } + virtual ~RemoteServer() { SAFE_DELETE(m_Socket); } void Shutdown() { delete this; } bool Connected() { return m_Socket != NULL && m_Socket->Connected(); } bool LocalProxies(rdctype::array *out) @@ -518,32 +518,32 @@ private: vector > m_RemoteDrivers; }; -extern "C" RENDERDOC_API void RENDERDOC_CC RemoteRenderer_Shutdown(RemoteRenderer *remote) +extern "C" RENDERDOC_API void RENDERDOC_CC RemoteServer_Shutdown(RemoteServer *remote) { remote->Shutdown(); } extern "C" RENDERDOC_API bool32 RENDERDOC_CC -RemoteRenderer_LocalProxies(RemoteRenderer *remote, rdctype::array *out) +RemoteServer_LocalProxies(RemoteServer *remote, rdctype::array *out) { return remote->LocalProxies(out); } extern "C" RENDERDOC_API bool32 RENDERDOC_CC -RemoteRenderer_RemoteSupportedReplays(RemoteRenderer *remote, rdctype::array *out) +RemoteServer_RemoteSupportedReplays(RemoteServer *remote, rdctype::array *out) { return remote->RemoteSupportedReplays(out); } extern "C" RENDERDOC_API ReplayCreateStatus RENDERDOC_CC -RemoteRenderer_CreateProxyRenderer(RemoteRenderer *remote, uint32_t proxyid, const char *logfile, +RemoteServer_CreateProxyRenderer(RemoteServer *remote, uint32_t proxyid, const char *logfile, float *progress, ReplayRenderer **rend) { return remote->CreateProxyRenderer(proxyid, logfile, progress, rend); } extern "C" RENDERDOC_API ReplayCreateStatus RENDERDOC_CC -RENDERDOC_CreateRemoteReplayConnection(const char *host, uint32_t port, RemoteRenderer **rend) +RENDERDOC_CreateRemoteServerConnection(const char *host, uint32_t port, RemoteServer **rend) { if(rend == NULL) return eReplayCreate_InternalError; @@ -565,7 +565,7 @@ RENDERDOC_CreateRemoteReplayConnection(const char *host, uint32_t port, RemoteRe return eReplayCreate_NetworkIOFailed; } - *rend = new RemoteRenderer(sock); + *rend = new RemoteServer(sock); return eReplayCreate_Success; } diff --git a/renderdocui/Code/RenderManager.cs b/renderdocui/Code/RenderManager.cs index 1b81074f8..94cf24582 100644 --- a/renderdocui/Code/RenderManager.cs +++ b/renderdocui/Code/RenderManager.cs @@ -161,7 +161,7 @@ namespace renderdocui.Code //////////////////////////////////////////// // Internals - private void CreateReplayRenderer(ref ReplayRenderer renderer, ref RemoteRenderer remote) + private void CreateReplayRenderer(ref ReplayRenderer renderer, ref RemoteServer remote) { if (m_ProxyRenderer < 0) { @@ -195,7 +195,7 @@ namespace renderdocui.Code try { ReplayRenderer renderer = null; - RemoteRenderer remote = null; + RemoteServer remote = null; CreateReplayRenderer(ref renderer, ref remote); if(renderer != null) { diff --git a/renderdocui/Interop/ReplayRenderer.cs b/renderdocui/Interop/ReplayRenderer.cs index 7261a5c2f..2e8b37ba8 100644 --- a/renderdocui/Interop/ReplayRenderer.cs +++ b/renderdocui/Interop/ReplayRenderer.cs @@ -842,28 +842,28 @@ namespace renderdoc } }; - public class RemoteRenderer + public class RemoteServer { [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern void RemoteRenderer_Shutdown(IntPtr real); + private static extern void RemoteServer_Shutdown(IntPtr real); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern bool RemoteRenderer_LocalProxies(IntPtr real, IntPtr outlist); + private static extern bool RemoteServer_LocalProxies(IntPtr real, IntPtr outlist); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern bool RemoteRenderer_RemoteSupportedReplays(IntPtr real, IntPtr outlist); + private static extern bool RemoteServer_RemoteSupportedReplays(IntPtr real, IntPtr outlist); [DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)] - private static extern ReplayCreateStatus RemoteRenderer_CreateProxyRenderer(IntPtr real, UInt32 proxyid, IntPtr logfile, ref float progress, ref IntPtr rendPtr); + private static extern ReplayCreateStatus RemoteServer_CreateProxyRenderer(IntPtr real, UInt32 proxyid, IntPtr logfile, ref float progress, ref IntPtr rendPtr); private IntPtr m_Real = IntPtr.Zero; - public RemoteRenderer(IntPtr real) { m_Real = real; } + public RemoteServer(IntPtr real) { m_Real = real; } public void Shutdown() { if (m_Real != IntPtr.Zero) { - RemoteRenderer_Shutdown(m_Real); + RemoteServer_Shutdown(m_Real); m_Real = IntPtr.Zero; } } @@ -871,7 +871,7 @@ namespace renderdoc public string[] LocalProxies() { IntPtr mem = CustomMarshal.Alloc(typeof(templated_array)); - bool success = RemoteRenderer_LocalProxies(m_Real, mem); + bool success = RemoteServer_LocalProxies(m_Real, mem); string[] ret = null; @@ -886,7 +886,7 @@ namespace renderdoc public string[] RemoteSupportedReplays() { IntPtr mem = CustomMarshal.Alloc(typeof(templated_array)); - bool success = RemoteRenderer_RemoteSupportedReplays(m_Real, mem); + bool success = RemoteServer_RemoteSupportedReplays(m_Real, mem); string[] ret = null; @@ -904,7 +904,7 @@ namespace renderdoc IntPtr logfile_mem = CustomMarshal.MakeUTF8String(logfile); - ReplayCreateStatus ret = RemoteRenderer_CreateProxyRenderer(m_Real, (UInt32)proxyid, logfile_mem, ref progress, ref rendPtr); + ReplayCreateStatus ret = RemoteServer_CreateProxyRenderer(m_Real, (UInt32)proxyid, logfile_mem, ref progress, ref rendPtr); CustomMarshal.Free(logfile_mem); diff --git a/renderdocui/Interop/StaticExports.cs b/renderdocui/Interop/StaticExports.cs index 9d8f2f391..0ebceefb4 100644 --- a/renderdocui/Interop/StaticExports.cs +++ b/renderdocui/Interop/StaticExports.cs @@ -202,7 +202,7 @@ namespace renderdoc CustomMarshal.Free(host_mem); } - public static RemoteRenderer CreateRemoteReplayConnection(string host, uint port) + public static RemoteServer CreateRemoteReplayConnection(string host, uint port) { IntPtr rendPtr = IntPtr.Zero; @@ -219,7 +219,7 @@ namespace renderdoc throw e; } - return new RemoteRenderer(rendPtr); + return new RemoteServer(rendPtr); } public static void BecomeRemoteServer(string host, uint port, ref bool killReplay)