Rename RemoteRenderer to RemoteServer

This commit is contained in:
baldurk
2016-08-19 12:23:19 +02:00
parent 5a6a200432
commit 4e450dbfcc
6 changed files with 35 additions and 35 deletions
+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)
{
+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);
+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)