lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-30 01:25:55 +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/LiveCapture.cpp
+10 -8
View File
@@ -617,9 +617,9 @@ bool LiveCapture::checkAllowClose()
// we either have to save or delete the capture. Make sure that if it's remote that we are able
// to by having an active connection or replay context on that host.
if(suppressRemoteWarning == false && (!m_Connection || !m_Connection->Connected()) &&
!cap->local &&
(!m_Ctx.Replay().CurrentRemote() || m_Ctx.Replay().CurrentRemote()->Hostname != m_Hostname ||
!m_Ctx.Replay().CurrentRemote()->Connected))
!cap->local && (!m_Ctx.Replay().CurrentRemote() ||
QString(m_Ctx.Replay().CurrentRemote()->Hostname) != m_Hostname ||
!m_Ctx.Replay().CurrentRemote()->Connected))
{
QMessageBox::StandardButton res2 = RDDialog::question(
this, tr("No active replay context"),
@@ -670,9 +670,9 @@ void LiveCapture::openCapture(Capture *cap)
{
cap->opened = true;
if(!cap->local &&
(!m_Ctx.Replay().CurrentRemote() || m_Ctx.Replay().CurrentRemote()->Hostname != m_Hostname ||
!m_Ctx.Replay().CurrentRemote()->Connected))
if(!cap->local && (!m_Ctx.Replay().CurrentRemote() ||
QString(m_Ctx.Replay().CurrentRemote()->Hostname) != m_Hostname ||
!m_Ctx.Replay().CurrentRemote()->Connected))
{
RDDialog::critical(
this, tr("No active replay context"),
@@ -725,7 +725,8 @@ bool LiveCapture::saveCapture(Capture *cap)
}
else
{
if(!m_Ctx.Replay().CurrentRemote() || m_Ctx.Replay().CurrentRemote()->Hostname != m_Hostname ||
if(!m_Ctx.Replay().CurrentRemote() ||
QString(m_Ctx.Replay().CurrentRemote()->Hostname) != m_Hostname ||
!m_Ctx.Replay().CurrentRemote()->Connected)
{
RDDialog::critical(this, tr("No active replay context"),
@@ -949,7 +950,8 @@ void LiveCapture::connectionClosed()
// to this machine as a remote context
if(!cap->local)
{
if(!m_Ctx.Replay().CurrentRemote() || m_Ctx.Replay().CurrentRemote()->Hostname != m_Hostname ||
if(!m_Ctx.Replay().CurrentRemote() ||
QString(m_Ctx.Replay().CurrentRemote()->Hostname) != m_Hostname ||
!m_Ctx.Replay().CurrentRemote()->Connected)
return;
}