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

Rename RemoteRenderer to RemoteServer

Browse Source
This commit is contained in:
baldurk
2016-08-02 19:08:15 +02:00
parent 5a6a200432
commit 4e450dbfcc
6 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/RenderManager.cpp
+2 -2
View File
@@ -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)
{
renderdoc/api/replay/renderdoc_replay.h
+10 -10
View File
@@ -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<rdctype::str> *out);
RemoteServer_LocalProxies(RemoteServer *remote, rdctype::array<rdctype::str> *out);
extern "C" RENDERDOC_API bool32 RENDERDOC_CC
RemoteRenderer_RemoteSupportedReplays(RemoteRenderer *remote, rdctype::array<rdctype::str> *out);
RemoteServer_RemoteSupportedReplays(RemoteServer *remote, rdctype::array<rdctype::str> *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);
renderdoc/core/remote_server.cpp
+9 -9
View File
@@ -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<RDCDriver, string> 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<rdctype::str> *out)
@@ -518,32 +518,32 @@ private:
vector<pair<RDCDriver, string> > 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<rdctype::str> *out)
RemoteServer_LocalProxies(RemoteServer *remote, rdctype::array<rdctype::str> *out)
{
return remote->LocalProxies(out);
}
extern "C" RENDERDOC_API bool32 RENDERDOC_CC
RemoteRenderer_RemoteSupportedReplays(RemoteRenderer *remote, rdctype::array<rdctype::str> *out)
RemoteServer_RemoteSupportedReplays(RemoteServer *remote, rdctype::array<rdctype::str> *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;
}
renderdocui/Code/RenderManager.cs
+2 -2
View File
@@ -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)
{
renderdocui/Interop/ReplayRenderer.cs
+10 -10
View File
@@ -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);
renderdocui/Interop/StaticExports.cs
+2 -2
View File
@@ -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)