lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-24 06:36:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use rdc types instead of Qt containers in public QRenderDoc interface

Browse Source 
* This is to support python bindings - the pyside implementation of
  QVector, QString, etc is not available to SWIG, so SWIG treates these
  all as opaque types.
* Rather than trying to set up bindings that work for rdcarray and
  QList/QVector, or implementing separate bindings, we instead just say
  that the public interface must use the rdc types. In most cases they
  seamlessly convert to/from Qt types anyway.
* In a couple of places we use an array of pairs instead of a map. In
  future we probably want an rdcdict or rdcmap with proper dict bindings
  in python.
This commit is contained in:
baldurk
2017-12-13 22:43:01 +00:00
parent d081623181
commit 0b527fab49
43 changed files with 754 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/Dialogs/CaptureDialog.cpp
+12 -12
View File
@@ -425,8 +425,8 @@ void CaptureDialog::CheckAndroidSetup(QString &filename)
LambdaThread *scan = new LambdaThread([this, filename]() {
QByteArray hostnameBytes = m_Ctx.Replay().CurrentRemote()->Hostname.toUtf8();
RENDERDOC_CheckAndroidPackage(hostnameBytes.data(), filename.toUtf8().data(), &m_AndroidFlags);
rdcstr host = m_Ctx.Replay().CurrentRemote()->Hostname;
RENDERDOC_CheckAndroidPackage(host.c_str(), filename.toUtf8().data(), &m_AndroidFlags);
const bool missingLibrary = bool(m_AndroidFlags & AndroidFlags::MissingLibrary);
const bool missingPermissions = bool(m_AndroidFlags & AndroidFlags::MissingPermissions);
@@ -534,8 +534,8 @@ void CaptureDialog::androidWarn_mouseClick()
// Call into layer push routine, then continue
LambdaThread *push = new LambdaThread([this, exe, &pushSucceeded]() {
QByteArray hostnameBytes = m_Ctx.Replay().CurrentRemote()->Hostname.toUtf8();
if(RENDERDOC_PushLayerToInstalledAndroidApp(hostnameBytes.data(), exe.toUtf8().data()))
rdcstr host = m_Ctx.Replay().CurrentRemote()->Hostname;
if(RENDERDOC_PushLayerToInstalledAndroidApp(host.c_str(), exe.toUtf8().data()))
{
// Sucess!
pushSucceeded = true;
@@ -599,8 +599,8 @@ void CaptureDialog::androidWarn_mouseClick()
// call into APK pull, patch, install routine, then continue
LambdaThread *patch = new LambdaThread([this, exe, &patchSucceeded, &progress]() {
QByteArray hostnameBytes = m_Ctx.Replay().CurrentRemote()->Hostname.toUtf8();
if(RENDERDOC_AddLayerToAndroidPackage(hostnameBytes.data(), exe.toUtf8().data(), &progress))
rdcstr host = m_Ctx.Replay().CurrentRemote()->Hostname;
if(RENDERDOC_AddLayerToAndroidPackage(host.c_str(), exe.toUtf8().data(), &progress))
{
// Sucess!
patchSucceeded = true;
@@ -955,7 +955,7 @@ CaptureSettings CaptureDialog::Settings()
return ret;
}
void CaptureDialog::SaveSettings(QString filename)
void CaptureDialog::SaveSettings(const rdcstr &filename)
{
QFile f(filename);
if(f.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text))
@@ -990,7 +990,7 @@ void CaptureDialog::fillProcessList()
}
}
void CaptureDialog::SetExecutableFilename(const QString &filename)
void CaptureDialog::SetExecutableFilename(const rdcstr &filename)
{
QString fn = filename;
@@ -1006,17 +1006,17 @@ void CaptureDialog::SetExecutableFilename(const QString &filename)
}
}
void CaptureDialog::SetWorkingDirectory(const QString &dir)
void CaptureDialog::SetWorkingDirectory(const rdcstr &dir)
{
ui->workDirPath->setText(dir);
}
void CaptureDialog::SetCommandLine(const QString &cmd)
void CaptureDialog::SetCommandLine(const rdcstr &cmd)
{
ui->cmdline->setText(cmd);
}
void CaptureDialog::LoadSettings(QString filename)
void CaptureDialog::LoadSettings(const rdcstr &filename)
{
QFile f(filename);
if(f.open(QIODevice::ReadOnly | QIODevice::Text))
@@ -1064,7 +1064,7 @@ void CaptureDialog::UpdateGlobalHook()
}
}
void CaptureDialog::SetEnvironmentModifications(const QList<EnvironmentModification> &modifications)
void CaptureDialog::SetEnvironmentModifications(const rdcarray<EnvironmentModification> &modifications)
{
m_EnvModifications = modifications;