Files
renderdoc/qrenderdoc/Code/Interface/PersistantConfig.cpp
T
Cody Northrop fb8eef23d0 android: Improve workflow on devices with root
During initial scan of application, detect if root access is available
and track it.  If user later selects "Click here for ways to fix this".
display a new dialogue that offers to push the layer directly.

If pushing fails, fall back to production dialogue.

Also add a new persistent setting to enable automatic layer pushing.
2017-08-15 09:36:20 -07:00

344 lines
8.7 KiB
C++

/******************************************************************************
* The MIT License (MIT)
*
* Copyright (c) 2016-2017 Baldur Karlsson
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
******************************************************************************/
#include <QDebug>
#include <QDir>
#include "Code/QRDUtils.h"
#include "QRDInterface.h"
#define JSON_ID "rdocConfigData"
#define JSON_VER 1
// helper templates to convert some more complex types to/from appropriate variants
template <typename variantType, typename origType>
variantType convertToVariant(const origType &val)
{
return variantType(val);
}
template <typename variantType, typename innerType>
variantType convertToVariant(const QList<innerType> &val)
{
variantType ret;
ret.reserve(val.count());
for(const innerType &s : val)
ret.push_back(s);
return ret;
}
template <>
QVariantMap convertToVariant(const QStringMap &val)
{
QVariantMap ret;
for(const QString &k : val.keys())
{
ret[k] = val[k];
}
return ret;
}
template <typename origType, typename variantType>
origType convertFromVariant(const variantType &val)
{
return origType(val);
}
template <>
QString convertFromVariant(const QVariant &val)
{
return val.toString();
}
template <typename listType>
listType convertFromVariant(const QList<QVariant> &val)
{
listType ret;
ret.reserve(val.count());
for(const QVariant &s : val)
ret.push_back(convertFromVariant<decltype(ret.value(0))>(s));
return ret;
}
template <>
QStringMap convertFromVariant(const QVariantMap &val)
{
QStringMap ret;
for(const QString &k : val.keys())
{
ret[k] = val[k].toString();
}
return ret;
}
bool PersistantConfig::Deserialize(const QString &filename)
{
QFile f(filename);
m_Filename = filename;
// silently allow missing configs
if(!f.exists())
return true;
if(f.open(QIODevice::ReadOnly | QIODevice::Text))
{
QVariantMap values;
bool success = LoadFromJSON(values, f, JSON_ID, JSON_VER);
if(!success)
return false;
applyValues(values);
return true;
}
qInfo() << "Couldn't load layout from " << filename << " " << f.errorString();
return false;
}
bool PersistantConfig::Serialize(const QString &filename)
{
if(!filename.isEmpty())
m_Filename = filename;
QVariantMap values = storeValues();
QFile f(m_Filename);
if(f.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text))
return SaveToJSON(values, f, JSON_ID, JSON_VER);
qWarning() << "Couldn't write to " << m_Filename << " " << f.errorString();
return false;
}
QVariantMap PersistantConfig::storeValues() const
{
QVariantMap ret;
#undef CONFIG_SETTING_VAL
#undef CONFIG_SETTING
#define CONFIG_SETTING_VAL(access, variantType, type, name, defaultValue) \
ret[lit(#name)] = convertToVariant<variantType>(name);
#define CONFIG_SETTING(access, variantType, type, name) \
ret[lit(#name)] = convertToVariant<variantType>(name);
CONFIG_SETTINGS()
return ret;
}
void PersistantConfig::applyValues(const QVariantMap &values)
{
#undef CONFIG_SETTING_VAL
#undef CONFIG_SETTING
#define CONFIG_SETTING_VAL(access, variantType, type, name, defaultValue) \
if(values.contains(lit(#name))) \
name = convertFromVariant<type>(values[lit(#name)].value<variantType>());
#define CONFIG_SETTING(access, variantType, type, name) \
if(values.contains(lit(#name))) \
name = convertFromVariant<type>(values[lit(#name)].value<variantType>());
CONFIG_SETTINGS()
}
void PersistantConfig::AddAndroidHosts()
{
QMap<QString, RemoteHost *> oldHosts;
for(int i = RemoteHosts.count() - 1; i >= 0; i--)
{
if(RemoteHosts[i]->IsHostADB())
{
RemoteHost *host = RemoteHosts.takeAt(i);
oldHosts[host->Hostname] = host;
}
}
QString adbExePath =
QFile::exists(Android_AdbExecutablePath) ? Android_AdbExecutablePath : QString();
// Set the config setting as it will be reused when we start the remoteserver etc.
SetConfigSetting(lit("adbExePath"), adbExePath);
SetConfigSetting(lit("MaxConnectTimeout"), QString::number(Android_MaxConnectTimeout));
SetConfigSetting(lit("Android_AutoPushLayerToApp"),
Android_AutoPushLayerToApp ? lit("1") : lit("0"));
rdctype::str androidHosts;
RENDERDOC_EnumerateAndroidDevices(&androidHosts);
for(const QString &hostName : ToQStr(androidHosts).split(QLatin1Char(','), QString::SkipEmptyParts))
{
RemoteHost *host = NULL;
if(oldHosts.contains(hostName))
host = oldHosts.take(hostName);
else
host = new RemoteHost();
host->Hostname = hostName;
rdctype::str friendly;
RENDERDOC_GetAndroidFriendlyName(hostName.toUtf8().data(), friendly);
host->FriendlyName = ToQStr(friendly);
// Just a command to display in the GUI and allow Launch() to be called.
host->RunCommand = lit("org.renderdoc.renderdoccmd");
RemoteHosts.push_back(host);
}
// delete any leftovers
QMapIterator<QString, RemoteHost *> i(oldHosts);
while(i.hasNext())
{
i.next();
delete i.value();
}
}
PersistantConfig::~PersistantConfig()
{
for(RemoteHost *h : RemoteHosts)
delete h;
}
bool PersistantConfig::Load(const QString &filename)
{
bool ret = Deserialize(filename);
// perform some sanitisation to make sure config is always in sensible state
for(const QString &key : ConfigSettings.keys())
{
// redundantly set each setting so it is flushed to the core dll
SetConfigSetting(key, ConfigSettings[key]);
}
RENDERDOC_SetConfigSetting("Disassembly_FriendlyNaming", ShaderViewer_FriendlyNaming ? "1" : "0");
// localhost should always be available as a remote host
bool foundLocalhost = false;
for(RemoteHost host : RemoteHostList)
{
RemoteHosts.push_back(new RemoteHost(host));
if(host.Hostname == lit("localhost"))
foundLocalhost = true;
}
if(!foundLocalhost)
{
RemoteHost *host = new RemoteHost();
host->Hostname = lit("localhost");
RemoteHosts.insert(RemoteHosts.begin(), host);
}
return ret;
}
bool PersistantConfig::Save()
{
if(m_Filename.isEmpty())
return true;
// update serialize list
RemoteHostList.clear();
for(RemoteHost *host : RemoteHosts)
RemoteHostList.push_back(*host);
RENDERDOC_SetConfigSetting("Disassembly_FriendlyNaming", ShaderViewer_FriendlyNaming ? "1" : "0");
return Serialize(m_Filename);
}
void PersistantConfig::Close()
{
m_Filename = QString();
}
void PersistantConfig::SetupFormatting()
{
Formatter::setParams(*this);
}
void AddRecentFile(QList<QString> &recentList, const QString &file, int maxItems)
{
QDir dir(file);
QString path = dir.canonicalPath();
if(!recentList.contains(path))
{
recentList.push_back(path);
if(recentList.count() >= maxItems)
recentList.removeAt(0);
}
else
{
recentList.removeOne(path);
recentList.push_back(path);
}
}
void PersistantConfig::SetConfigSetting(const QString &name, const QString &value)
{
if(name.isEmpty())
return;
ConfigSettings[name] = value;
RENDERDOC_SetConfigSetting(name.toUtf8().data(), value.toUtf8().data());
}
QString PersistantConfig::GetConfigSetting(const QString &name)
{
if(ConfigSettings.contains(name))
return ConfigSettings[name];
return QString();
}
SPIRVDisassembler::SPIRVDisassembler(const QVariant &var)
{
QVariantMap map = var.toMap();
if(map.contains(lit("name")))
name = map[lit("name")].toString();
if(map.contains(lit("executable")))
executable = map[lit("executable")].toString();
if(map.contains(lit("args")))
args = map[lit("args")].toString();
}
SPIRVDisassembler::operator QVariant() const
{
QVariantMap map;
map[lit("name")] = name;
map[lit("executable")] = executable;
map[lit("args")] = args;
return map;
}