lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-28 21:01:04 +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-02 17:03:55 +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
renderdocui/Code/AppMain.cs
+4 -1
View File
@@ -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]+)$";
renderdocui/Interop/Enums.cs
+1 -1
View File
@@ -508,7 +508,7 @@ namespace renderdoc
APIHardwareUnsupported,
};
public enum RemoteMessageType
public enum TargetControlMessageType
{
Unknown = 0,
Disconnected,
renderdocui/Interop/ReplayRenderer.cs
+33 -33
View File
@@ -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();
};
};
renderdocui/Interop/StaticExports.cs
+7 -7
View File
@@ -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;
renderdocui/Windows/Dialogs/LiveCapture.cs
+2 -2
View File
@@ -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)
{
renderdocui/Windows/Dialogs/RemoteHostSelect.cs
+2 -2
View File
@@ -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)
{
renderdocui/Windows/Dialogs/UpdateDialog.cs
+2 -2
View File
@@ -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";