diff --git a/qrenderdoc/Code/Interface/CommonPipelineState.cpp b/qrenderdoc/Code/Interface/CommonPipelineState.cpp index 96d11c34a..a8f2cfb74 100644 --- a/qrenderdoc/Code/Interface/CommonPipelineState.cpp +++ b/qrenderdoc/Code/Interface/CommonPipelineState.cpp @@ -35,7 +35,7 @@ QString CommonPipelineState::GetResourceLayout(ResourceId id) for(const VKPipe::ImageData &i : m_Vulkan->images) { if(i.image == id) - return ToQStr(i.layouts[0].name); + return i.layouts[0].name; } } @@ -44,7 +44,7 @@ QString CommonPipelineState::GetResourceLayout(ResourceId id) for(const D3D12Pipe::ResourceData &r : m_D3D12->Resources) { if(r.id == id) - return ToQStr(r.states[0].name); + return r.states[0].name; } } } @@ -353,23 +353,21 @@ const ShaderReflection *CommonPipelineState::GetShaderReflection(ShaderStage sta QString CommonPipelineState::GetShaderEntryPoint(ShaderStage stage) { - QString ret; - if(LogLoaded() && IsLogVK()) { switch(stage) { - case ShaderStage::Vertex: ret = ToQStr(m_Vulkan->m_VS.entryPoint); break; - case ShaderStage::Tess_Control: ret = ToQStr(m_Vulkan->m_TCS.entryPoint); break; - case ShaderStage::Tess_Eval: ret = ToQStr(m_Vulkan->m_TES.entryPoint); break; - case ShaderStage::Geometry: ret = ToQStr(m_Vulkan->m_GS.entryPoint); break; - case ShaderStage::Fragment: ret = ToQStr(m_Vulkan->m_FS.entryPoint); break; - case ShaderStage::Compute: ret = ToQStr(m_Vulkan->m_CS.entryPoint); break; + case ShaderStage::Vertex: return m_Vulkan->m_VS.entryPoint; + case ShaderStage::Tess_Control: return m_Vulkan->m_TCS.entryPoint; + case ShaderStage::Tess_Eval: return m_Vulkan->m_TES.entryPoint; + case ShaderStage::Geometry: return m_Vulkan->m_GS.entryPoint; + case ShaderStage::Fragment: return m_Vulkan->m_FS.entryPoint; + case ShaderStage::Compute: return m_Vulkan->m_CS.entryPoint; default: break; } } - return ret; + return QString(); } ResourceId CommonPipelineState::GetShader(ShaderStage stage) @@ -443,12 +441,12 @@ QString CommonPipelineState::GetShaderName(ShaderStage stage) { switch(stage) { - case ShaderStage::Vertex: ret = ToQStr(m_D3D11->m_VS.name); break; - case ShaderStage::Domain: ret = ToQStr(m_D3D11->m_DS.name); break; - case ShaderStage::Hull: ret = ToQStr(m_D3D11->m_HS.name); break; - case ShaderStage::Geometry: ret = ToQStr(m_D3D11->m_GS.name); break; - case ShaderStage::Pixel: ret = ToQStr(m_D3D11->m_PS.name); break; - case ShaderStage::Compute: ret = ToQStr(m_D3D11->m_CS.name); break; + case ShaderStage::Vertex: return m_D3D11->m_VS.name; + case ShaderStage::Domain: return m_D3D11->m_DS.name; + case ShaderStage::Hull: return m_D3D11->m_HS.name; + case ShaderStage::Geometry: return m_D3D11->m_GS.name; + case ShaderStage::Pixel: return m_D3D11->m_PS.name; + case ShaderStage::Compute: return m_D3D11->m_CS.name; default: break; } } @@ -456,12 +454,12 @@ QString CommonPipelineState::GetShaderName(ShaderStage stage) { switch(stage) { - case ShaderStage::Vertex: ret = ToQStr(m_D3D12->name) + lit(" VS"); break; - case ShaderStage::Domain: ret = ToQStr(m_D3D12->name) + lit(" DS"); break; - case ShaderStage::Hull: ret = ToQStr(m_D3D12->name) + lit(" HS"); break; - case ShaderStage::Geometry: ret = ToQStr(m_D3D12->name) + lit(" GS"); break; - case ShaderStage::Pixel: ret = ToQStr(m_D3D12->name) + lit(" PS"); break; - case ShaderStage::Compute: ret = ToQStr(m_D3D12->name) + lit(" CS"); break; + case ShaderStage::Vertex: return m_D3D12->name + lit(" VS"); + case ShaderStage::Domain: return m_D3D12->name + lit(" DS"); + case ShaderStage::Hull: return m_D3D12->name + lit(" HS"); + case ShaderStage::Geometry: return m_D3D12->name + lit(" GS"); + case ShaderStage::Pixel: return m_D3D12->name + lit(" PS"); + case ShaderStage::Compute: return m_D3D12->name + lit(" CS"); default: break; } } @@ -469,12 +467,12 @@ QString CommonPipelineState::GetShaderName(ShaderStage stage) { switch(stage) { - case ShaderStage::Vertex: ret = ToQStr(m_GL->m_VS.ShaderName); break; - case ShaderStage::Tess_Control: ret = ToQStr(m_GL->m_TCS.ShaderName); break; - case ShaderStage::Tess_Eval: ret = ToQStr(m_GL->m_TES.ShaderName); break; - case ShaderStage::Geometry: ret = ToQStr(m_GL->m_GS.ShaderName); break; - case ShaderStage::Fragment: ret = ToQStr(m_GL->m_FS.ShaderName); break; - case ShaderStage::Compute: ret = ToQStr(m_GL->m_CS.ShaderName); break; + case ShaderStage::Vertex: return m_GL->m_VS.ShaderName; + case ShaderStage::Tess_Control: return m_GL->m_TCS.ShaderName; + case ShaderStage::Tess_Eval: return m_GL->m_TES.ShaderName; + case ShaderStage::Geometry: return m_GL->m_GS.ShaderName; + case ShaderStage::Fragment: return m_GL->m_FS.ShaderName; + case ShaderStage::Compute: return m_GL->m_CS.ShaderName; default: break; } } @@ -482,18 +480,18 @@ QString CommonPipelineState::GetShaderName(ShaderStage stage) { switch(stage) { - case ShaderStage::Vertex: ret = ToQStr(m_Vulkan->m_VS.name); break; - case ShaderStage::Domain: ret = ToQStr(m_Vulkan->m_TCS.name); break; - case ShaderStage::Hull: ret = ToQStr(m_Vulkan->m_TES.name); break; - case ShaderStage::Geometry: ret = ToQStr(m_Vulkan->m_GS.name); break; - case ShaderStage::Pixel: ret = ToQStr(m_Vulkan->m_FS.name); break; - case ShaderStage::Compute: ret = ToQStr(m_Vulkan->m_CS.name); break; + case ShaderStage::Vertex: return m_Vulkan->m_VS.name; + case ShaderStage::Domain: return m_Vulkan->m_TCS.name; + case ShaderStage::Hull: return m_Vulkan->m_TES.name; + case ShaderStage::Geometry: return m_Vulkan->m_GS.name; + case ShaderStage::Pixel: return m_Vulkan->m_FS.name; + case ShaderStage::Compute: return m_Vulkan->m_CS.name; default: break; } } } - return ret; + return QString(); } QPair CommonPipelineState::GetIBuffer() @@ -641,12 +639,12 @@ QVector CommonPipelineState::GetVertexInputs() QVector ret(layouts.count); for(int i = 0; i < layouts.count; i++) { - QString semName = ToQStr(layouts[i].SemanticName); + QString semName = layouts[i].SemanticName; bool needsSemanticIdx = false; for(int j = 0; j < layouts.count; j++) { - if(i != j && !semName.compare(ToQStr(layouts[j].SemanticName), Qt::CaseInsensitive)) + if(i != j && !semName.compare(layouts[j].SemanticName, Qt::CaseInsensitive)) { needsSemanticIdx = true; break; @@ -677,7 +675,7 @@ QVector CommonPipelineState::GetVertexInputs() rdctype::array &sig = m_D3D11->m_IA.Bytecode->InputSig; for(int ia = 0; ia < sig.count; ia++) { - if(!semName.compare(ToQStr(sig[ia].semanticName), Qt::CaseInsensitive) && + if(!semName.compare(sig[ia].semanticName, Qt::CaseInsensitive) && sig[ia].semanticIndex == layouts[i].SemanticIndex) { ret[i].Used = true; @@ -698,12 +696,12 @@ QVector CommonPipelineState::GetVertexInputs() QVector ret(layouts.count); for(int i = 0; i < layouts.count; i++) { - QString semName = ToQStr(layouts[i].SemanticName); + QString semName = layouts[i].SemanticName; bool needsSemanticIdx = false; for(int j = 0; j < layouts.count; j++) { - if(i != j && !semName.compare(ToQStr(layouts[j].SemanticName), Qt::CaseInsensitive)) + if(i != j && !semName.compare(layouts[j].SemanticName, Qt::CaseInsensitive)) { needsSemanticIdx = true; break; @@ -734,7 +732,7 @@ QVector CommonPipelineState::GetVertexInputs() rdctype::array &sig = m_D3D12->m_VS.ShaderDetails->InputSig; for(int ia = 0; ia < sig.count; ia++) { - if(!semName.compare(ToQStr(sig[ia].semanticName), Qt::CaseInsensitive) && + if(!semName.compare(sig[ia].semanticName, Qt::CaseInsensitive) && sig[ia].semanticIndex == layouts[i].SemanticIndex) { ret[i].Used = true; @@ -781,7 +779,7 @@ QVector CommonPipelineState::GetVertexInputs() int attrib = m_GL->m_VS.BindpointMapping.InputAttributes[i]; if(attrib >= 0 && attrib < m_GL->m_VS.ShaderDetails->InputSig.count) - ret[a].Name = ToQStr(m_GL->m_VS.ShaderDetails->InputSig[attrib].varName); + ret[a].Name = m_GL->m_VS.ShaderDetails->InputSig[attrib].varName; if(attrib == -1) continue; @@ -863,7 +861,7 @@ QVector CommonPipelineState::GetVertexInputs() attrib = m_Vulkan->m_VS.BindpointMapping.InputAttributes[attrs[i].location]; if(attrib >= 0 && attrib < m_Vulkan->m_VS.ShaderDetails->InputSig.count) - ret[a].Name = ToQStr(m_Vulkan->m_VS.ShaderDetails->InputSig[attrib].varName); + ret[a].Name = m_Vulkan->m_VS.ShaderDetails->InputSig[attrib].varName; if(attrib == -1) continue; diff --git a/qrenderdoc/Code/Interface/PersistantConfig.cpp b/qrenderdoc/Code/Interface/PersistantConfig.cpp index 5c97f039f..e61c760de 100644 --- a/qrenderdoc/Code/Interface/PersistantConfig.cpp +++ b/qrenderdoc/Code/Interface/PersistantConfig.cpp @@ -195,7 +195,8 @@ void PersistantConfig::AddAndroidHosts() rdctype::str androidHosts; RENDERDOC_EnumerateAndroidDevices(&androidHosts); - for(const QString &hostName : ToQStr(androidHosts).split(QLatin1Char(','), QString::SkipEmptyParts)) + for(const QString &hostName : + QString(androidHosts).split(QLatin1Char(','), QString::SkipEmptyParts)) { RemoteHost *host = NULL; @@ -207,7 +208,7 @@ void PersistantConfig::AddAndroidHosts() host->Hostname = hostName; rdctype::str friendly; RENDERDOC_GetAndroidFriendlyName(hostName.toUtf8().data(), friendly); - host->FriendlyName = ToQStr(friendly); + host->FriendlyName = 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); diff --git a/qrenderdoc/Code/Interface/QRDInterface.cpp b/qrenderdoc/Code/Interface/QRDInterface.cpp index 3008455a8..a6cfbaecf 100644 --- a/qrenderdoc/Code/Interface/QRDInterface.cpp +++ b/qrenderdoc/Code/Interface/QRDInterface.cpp @@ -7,8 +7,8 @@ QVariant EnvModToVariant(const EnvironmentModification &env) { QVariantMap ret; - ret[lit("variable")] = ToQStr(env.name); - ret[lit("value")] = ToQStr(env.value); + ret[lit("variable")] = env.name; + ret[lit("value")] = env.value; ret[lit("type")] = ToQStr(env.mod); ret[lit("separator")] = ToQStr(env.sep); return ret; diff --git a/qrenderdoc/Code/QRDUtils.cpp b/qrenderdoc/Code/QRDUtils.cpp index 5f3a596fc..13afd213a 100644 --- a/qrenderdoc/Code/QRDUtils.cpp +++ b/qrenderdoc/Code/QRDUtils.cpp @@ -213,7 +213,7 @@ QString TypeString(const SigParameter &sig) QString D3DSemanticString(const SigParameter &sig) { if(sig.systemValue == ShaderBuiltin::Undefined) - return ToQStr(sig.semanticIdxName); + return sig.semanticIdxName; QString sysValues[ENUM_ARRAY_SIZE(ShaderBuiltin)] = { lit("SV_Undefined"), diff --git a/qrenderdoc/Code/QRDUtils.h b/qrenderdoc/Code/QRDUtils.h index e0361fb78..2b4d6a462 100644 --- a/qrenderdoc/Code/QRDUtils.h +++ b/qrenderdoc/Code/QRDUtils.h @@ -600,13 +600,6 @@ inline QString ToQStr(const T &el) return QString::fromStdString(ToStr::Get(el)); } -// overload for rdctype::str -template <> -inline QString ToQStr(const rdctype::str &el) -{ - return QString::fromUtf8(el.elems, el.count); -} - // overload for a couple of things that need to know the pipeline type when converting QString ToQStr(const ResourceUsage usage, const GraphicsAPI apitype); diff --git a/qrenderdoc/Code/ReplayManager.cpp b/qrenderdoc/Code/ReplayManager.cpp index fde750c74..b474a2113 100644 --- a/qrenderdoc/Code/ReplayManager.cpp +++ b/qrenderdoc/Code/ReplayManager.cpp @@ -93,7 +93,7 @@ QStringList ReplayManager::GetRemoteSupport() rdctype::array supported = m_Remote->RemoteSupportedReplays(); for(rdctype::str &s : supported) - ret << ToQStr(s); + ret << s; } return ret; @@ -172,7 +172,7 @@ QString ReplayManager::CopyCaptureToRemote(const QString &localpath, QWidget *wi auto lambda = [this, localpath, &remotepath, &progress, &copied](IReplayController *r) { QMutexLocker autolock(&m_RemoteLock); - remotepath = ToQStr(m_Remote->CopyCaptureToRemote(localpath.toUtf8().data(), &progress)); + remotepath = m_Remote->CopyCaptureToRemote(localpath.toUtf8().data(), &progress); copied = true; }; diff --git a/qrenderdoc/Windows/APIInspector.cpp b/qrenderdoc/Windows/APIInspector.cpp index 6cfd6e422..d9375b83c 100644 --- a/qrenderdoc/Windows/APIInspector.cpp +++ b/qrenderdoc/Windows/APIInspector.cpp @@ -85,7 +85,7 @@ void APIInspector::addCallstack(rdctype::array calls) else { for(rdctype::str &s : calls) - ui->callstack->addItem(ToQStr(s)); + ui->callstack->addItem(s); } ui->callstack->setUpdatesEnabled(true); } @@ -130,7 +130,7 @@ void APIInspector::fillAPIView() { for(const APIEvent &ev : draw->events) { - QStringList lines = ToQStr(ev.eventDesc).split(lit("\n"), QString::SkipEmptyParts); + QStringList lines = QString(ev.eventDesc).split(lit("\n"), QString::SkipEmptyParts); RDTreeWidgetItem *root = new RDTreeWidgetItem({QString::number(ev.eventID), lines[0]}); diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp index 3f21cef93..7cbc094d7 100644 --- a/qrenderdoc/Windows/BufferViewer.cpp +++ b/qrenderdoc/Windows/BufferViewer.cpp @@ -2214,7 +2214,7 @@ void BufferViewer::configureMeshColumns() FormatElement f; f.buffer = 0; - f.name = sig.varName.count > 0 ? ToQStr(sig.varName) : ToQStr(sig.semanticIdxName); + f.name = sig.varName.count > 0 ? sig.varName : sig.semanticIdxName; f.format.compByteWidth = sizeof(float); f.format.compCount = sig.compCount; f.format.compType = sig.compType; @@ -2281,7 +2281,7 @@ void BufferViewer::configureMeshColumns() FormatElement f; f.buffer = 0; - f.name = sig.varName.count > 0 ? ToQStr(sig.varName) : ToQStr(sig.semanticIdxName); + f.name = sig.varName.count > 0 ? sig.varName : sig.semanticIdxName; f.format.compByteWidth = sizeof(float); f.format.compCount = sig.compCount; f.format.compType = sig.compType; @@ -2486,7 +2486,7 @@ void BufferViewer::ViewBuffer(uint64_t byteOffset, uint64_t byteSize, ResourceId BufferDescription *buf = m_Ctx.GetBuffer(id); if(buf) { - setWindowTitle(ToQStr(buf->name) + lit(" - Contents")); + setWindowTitle(buf->name + lit(" - Contents")); m_ObjectByteSize = buf->length; } @@ -2506,7 +2506,7 @@ void BufferViewer::ViewTexture(uint32_t arrayIdx, uint32_t mip, ResourceId id, c TextureDescription *tex = m_Ctx.GetTexture(id); if(tex) { - setWindowTitle(ToQStr(tex->name) + lit(" - Contents")); + setWindowTitle(tex->name + lit(" - Contents")); m_ObjectByteSize = tex->byteSize; } diff --git a/qrenderdoc/Windows/ConstantBufferPreviewer.cpp b/qrenderdoc/Windows/ConstantBufferPreviewer.cpp index 0871e6c26..d3fdf2275 100644 --- a/qrenderdoc/Windows/ConstantBufferPreviewer.cpp +++ b/qrenderdoc/Windows/ConstantBufferPreviewer.cpp @@ -230,15 +230,15 @@ void ConstantBufferPreviewer::addVariables(RDTreeWidgetItem *root, { for(const ShaderVariable &v : vars) { - RDTreeWidgetItem *n = new RDTreeWidgetItem({ToQStr(v.name), VarString(v), TypeString(v)}); + RDTreeWidgetItem *n = new RDTreeWidgetItem({v.name, VarString(v), TypeString(v)}); root->addChild(n); if(v.rows > 1) { for(uint32_t i = 0; i < v.rows; i++) - n->addChild(new RDTreeWidgetItem({QFormatStr("%1.row%2").arg(ToQStr(v.name)).arg(i), - RowString(v, i), RowTypeString(v)})); + n->addChild(new RDTreeWidgetItem( + {QFormatStr("%1.row%2").arg(v.name).arg(i), RowString(v, i), RowTypeString(v)})); } if(v.members.count > 0) @@ -334,7 +334,7 @@ void ConstantBufferPreviewer::updateLabels() BufferDescription *buf = m_Ctx.GetBuffer(m_cbuffer); if(buf) { - bufName = ToQStr(buf->name); + bufName = buf->name; if(buf->customName) needName = false; } @@ -345,7 +345,7 @@ void ConstantBufferPreviewer::updateLabels() { if(needName && (int)m_slot < reflection->ConstantBlocks.count && reflection->ConstantBlocks[m_slot].name.count > 0) - bufName = QFormatStr("<%1>").arg(ToQStr(reflection->ConstantBlocks[m_slot].name)); + bufName = QFormatStr("<%1>").arg(reflection->ConstantBlocks[m_slot].name); } ui->nameLabel->setText(bufName); diff --git a/qrenderdoc/Windows/DebugMessageView.cpp b/qrenderdoc/Windows/DebugMessageView.cpp index d3e991e8d..16e60e7a5 100644 --- a/qrenderdoc/Windows/DebugMessageView.cpp +++ b/qrenderdoc/Windows/DebugMessageView.cpp @@ -102,7 +102,7 @@ public: case 2: return ToQStr(msg.severity); case 3: return ToQStr(msg.category); case 4: return msg.messageID; - case 5: return ToQStr(msg.description); + case 5: return msg.description; default: break; } } diff --git a/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp b/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp index 5f6d9b2cf..ac990400c 100644 --- a/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp @@ -43,17 +43,11 @@ static QString GetDescription(const EnvironmentModification &env) QString ret; if(env.mod == EnvMod::Append) - ret = QFormatStr("Append %1 with %2 using %3") - .arg(ToQStr(env.name)) - .arg(ToQStr(env.value)) - .arg(ToQStr(env.sep)); + ret = QFormatStr("Append %1 with %2 using %3").arg(env.name).arg(env.value).arg(ToQStr(env.sep)); else if(env.mod == EnvMod::Prepend) - ret = QFormatStr("Prepend %1 with %2 using %3") - .arg(ToQStr(env.name)) - .arg(ToQStr(env.value)) - .arg(ToQStr(env.sep)); + ret = QFormatStr("Prepend %1 with %2 using %3").arg(env.name).arg(env.value).arg(ToQStr(env.sep)); else - ret = QFormatStr("Set %1 to %2").arg(ToQStr(env.name)).arg(ToQStr(env.value)); + ret = QFormatStr("Set %1 to %2").arg(env.name).arg(env.value); return ret; } @@ -305,7 +299,7 @@ void CaptureDialog::vulkanLayerWarn_mouseClick() "RenderDoc documentation, or package/distribution documentation on linux\n\n"); for(const rdctype::str &j : otherJSONs) - msg += ToQStr(j) + lit("\n"); + msg += j + lit("\n"); RDDialog::critical(this, tr("Unfixable vulkan layer configuration"), msg); return; @@ -342,7 +336,7 @@ void CaptureDialog::vulkanLayerWarn_mouseClick() if(hasOtherJSON) { for(const rdctype::str &j : otherJSONs) - msg += (updateAllowed ? tr("Unregister/update: %1\n") : tr("Unregister: %1\n")).arg(ToQStr(j)); + msg += (updateAllowed ? tr("Unregister/update: %1\n") : tr("Unregister: %1\n")).arg(j); msg += lit("\n"); } @@ -352,13 +346,13 @@ void CaptureDialog::vulkanLayerWarn_mouseClick() if(registerAll) { for(const rdctype::str &j : myJSONs) - msg += (updateAllowed ? tr("Register/update: %1\n") : tr("Register: %1\n")).arg(ToQStr(j)); + msg += (updateAllowed ? tr("Register/update: %1\n") : tr("Register: %1\n")).arg(j); } else { msg += updateAllowed ? tr("Register one of:\n") : tr("Register/update one of:\n"); for(const rdctype::str &j : myJSONs) - msg += tr(" -- %1\n").arg(ToQStr(j)); + msg += tr(" -- %1\n").arg(j); } msg += lit("\n"); diff --git a/qrenderdoc/Windows/Dialogs/EnvironmentEditor.cpp b/qrenderdoc/Windows/Dialogs/EnvironmentEditor.cpp index 6dcf3a5cc..06dd4e5a0 100644 --- a/qrenderdoc/Windows/Dialogs/EnvironmentEditor.cpp +++ b/qrenderdoc/Windows/Dialogs/EnvironmentEditor.cpp @@ -131,8 +131,8 @@ void EnvironmentEditor::on_variables_currentItemChanged(RDTreeWidgetItem *curren if(!mod.value.empty()) { - ui->name->setText(ToQStr(mod.name)); - ui->value->setText(ToQStr(mod.value)); + ui->name->setText(mod.name); + ui->value->setText(mod.value); ui->separator->setCurrentIndex((int)mod.sep); if(mod.mod == EnvMod::Set) @@ -203,15 +203,15 @@ void EnvironmentEditor::addModification(EnvironmentModification mod, bool silent if(idx < 0) { - node = new RDTreeWidgetItem({ToQStr(mod.name), GetTypeString(mod), ToQStr(mod.value)}); + node = new RDTreeWidgetItem({mod.name, GetTypeString(mod), mod.value}); ui->variables->addTopLevelItem(node); } else { node = ui->variables->topLevelItem(idx); - node->setText(0, ToQStr(mod.name)); + node->setText(0, mod.name); node->setText(1, GetTypeString(mod)); - node->setText(2, ToQStr(mod.value)); + node->setText(2, mod.value); } node->setTag(QVariant::fromValue(mod)); diff --git a/qrenderdoc/Windows/Dialogs/LiveCapture.cpp b/qrenderdoc/Windows/Dialogs/LiveCapture.cpp index 738eca46a..24b6dab3c 100644 --- a/qrenderdoc/Windows/Dialogs/LiveCapture.cpp +++ b/qrenderdoc/Windows/Dialogs/LiveCapture.cpp @@ -1077,7 +1077,7 @@ void LiveCapture::connectionThreadEntry() if(msg.Type == TargetControlMessageType::RegisterAPI) { - QString api = ToQStr(msg.RegisterAPI.APIName); + QString api = msg.RegisterAPI.APIName; GUIInvoke::call([this, api]() { QString target = QString::fromUtf8(m_Connection->GetTarget()); uint32_t pid = m_Connection->GetPID(); @@ -1105,7 +1105,7 @@ void LiveCapture::connectionThreadEntry() rdctype::array thumb = msg.NewCapture.thumbnail; int32_t thumbWidth = msg.NewCapture.thumbWidth; int32_t thumbHeight = msg.NewCapture.thumbHeight; - QString path = ToQStr(msg.NewCapture.path); + QString path = msg.NewCapture.path; bool local = msg.NewCapture.local; GUIInvoke::call([this, capID, timestamp, thumb, thumbWidth, thumbHeight, path, local]() { @@ -1119,7 +1119,7 @@ void LiveCapture::connectionThreadEntry() if(msg.Type == TargetControlMessageType::CaptureCopied) { uint32_t capID = msg.NewCapture.ID; - QString path = ToQStr(msg.NewCapture.path); + QString path = msg.NewCapture.path; GUIInvoke::call([=]() { captureCopied(capID, path); }); } diff --git a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp index a6699f0dc..57e84cefd 100644 --- a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp @@ -160,7 +160,7 @@ public: for(int i = 0; i < node->children.count(); i++) { - if(ToQStr(node->children[i]->file.filename) + if(QString(node->children[i]->file.filename) .compare(nextDir, NTPaths ? Qt::CaseInsensitive : Qt::CaseSensitive) == 0) { ret = index(i, 0, ret); @@ -171,7 +171,7 @@ public: // if we didn't move to a child, stop searching if(node == getNode(ret)) { - qCritical() << "Couldn't find child" << nextDir << "at" << ToQStr(node->file.filename) + qCritical() << "Couldn't find child" << nextDir << "at" << QString(node->file.filename) << "from" << path; return QModelIndex(); } @@ -303,7 +303,7 @@ public: { switch(index.column()) { - case 0: { return ToQStr(node->file.filename); + case 0: { return node->file.filename; } case 1: { @@ -354,7 +354,7 @@ public: case FileIsAccessDeniedRole: return bool(node->file.flags & PathProperty::ErrorAccessDenied); case FilePathRole: return makePath(node); - case FileNameRole: return ToQStr(node->file.filename); + case FileNameRole: return node->file.filename; default: break; } } @@ -420,19 +420,19 @@ private: QString makePath(FSNode *node) const { QChar sep = NTPaths ? QLatin1Char('\\') : QLatin1Char('/'); - QString ret = ToQStr(node->file.filename); + QString ret = node->file.filename; FSNode *parent = node->parent; // iterate through subdirs but stop before a root while(parent && parent->parent) { - ret = ToQStr(parent->file.filename) + sep + ret; + ret = parent->file.filename + sep + ret; parent = parent->parent; } if(parent) { // parent is now a root - ret = ToQStr(parent->file.filename) + ret; + ret = parent->file.filename + ret; } ret.replace(QLatin1Char('/'), sep); return ret; diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp index f3b59fdb4..b0d33df99 100644 --- a/qrenderdoc/Windows/EventBrowser.cpp +++ b/qrenderdoc/Windows/EventBrowser.cpp @@ -231,7 +231,7 @@ QPair EventBrowser::AddDrawcalls(RDTreeWidgetItem *parent, const DrawcallDescription &d = draws[i]; RDTreeWidgetItem *child = new RDTreeWidgetItem( - {ToQStr(d.name), QString::number(d.eventID), QString::number(d.drawcallID), lit("---")}); + {d.name, QString::number(d.eventID), QString::number(d.drawcallID), lit("---")}); QPair last = AddDrawcalls(child, d.children); lastEID = last.first; @@ -666,7 +666,7 @@ QString EventBrowser::GetExportDrawcallString(int indent, bool firstchild, if(firstchild) prefix += QLatin1Char('\\'); - return QFormatStr("%1- %2").arg(prefix).arg(ToQStr(drawcall.name)); + return QFormatStr("%1- %2").arg(prefix).arg(drawcall.name); } double EventBrowser::GetDrawTime(const DrawcallDescription &drawcall) diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp index a7df0be84..6be444738 100644 --- a/qrenderdoc/Windows/MainWindow.cpp +++ b/qrenderdoc/Windows/MainWindow.cpp @@ -1569,7 +1569,7 @@ void MainWindow::on_action_Start_Replay_Loop_triggered() id = displayTex->ID; popup.resize((int)displayTex->width, (int)displayTex->height); popup.setWindowTitle( - tr("Looping replay of %1 Displaying %2").arg(m_Ctx.LogFilename()).arg(ToQStr(displayTex->name))); + tr("Looping replay of %1 Displaying %2").arg(m_Ctx.LogFilename()).arg(displayTex->name)); } else { diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp index a04eff10a..b170845e4 100644 --- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp @@ -494,8 +494,8 @@ void D3D11PipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const D3D1 if(res.Format != tex->format) { text += tr("The texture is format %1, the view treats it as %2.\n") - .arg(ToQStr(tex->format.strname)) - .arg(ToQStr(res.Format.strname)); + .arg(tex->format.strname) + .arg(res.Format.strname); viewdetails = true; } @@ -602,7 +602,7 @@ void D3D11PipelineStateViewer::addResourceRow(const D3D11ViewTag &view, QString slotname = view.type == D3D11ViewTag::OMDepth ? tr("Depth") : QString::number(view.index); if(shaderInput && !shaderInput->name.empty()) - slotname += lit(": ") + ToQStr(shaderInput->name); + slotname += lit(": ") + shaderInput->name; uint32_t w = 1, h = 1, d = 1; uint32_t a = 1; @@ -626,8 +626,8 @@ void D3D11PipelineStateViewer::addResourceRow(const D3D11ViewTag &view, h = tex->height; d = tex->depth; a = tex->arraysize; - format = ToQStr(tex->format.strname); - name = ToQStr(tex->name); + format = tex->format.strname; + name = tex->name; typeName = ToQStr(tex->resType); if(tex->resType == TextureDim::Texture2DMS || tex->resType == TextureDim::Texture2DMSArray) @@ -636,7 +636,7 @@ void D3D11PipelineStateViewer::addResourceRow(const D3D11ViewTag &view, } if(tex->format != r.Format) - format = tr("Viewed as %1").arg(ToQStr(r.Format.strname)); + format = tr("Viewed as %1").arg(r.Format.strname); if(HasImportantViewParams(r, tex)) viewDetails = true; @@ -651,7 +651,7 @@ void D3D11PipelineStateViewer::addResourceRow(const D3D11ViewTag &view, d = 0; a = 0; format = QString(); - name = ToQStr(buf->name); + name = buf->name; typeName = lit("Buffer"); if(r.Flags & D3DBufferViewFlags::Raw) @@ -678,13 +678,13 @@ void D3D11PipelineStateViewer::addResourceRow(const D3D11ViewTag &view, if(r.Format.compType == CompType::Typeless) { if(!shaderInput->variableType.members.empty()) - format = lit("struct ") + ToQStr(shaderInput->variableType.descriptor.name); + format = lit("struct ") + shaderInput->variableType.descriptor.name; else - format = ToQStr(shaderInput->variableType.descriptor.name); + format = shaderInput->variableType.descriptor.name; } else { - format = ToQStr(r.Format.strname); + format = r.Format.strname; } } @@ -849,13 +849,13 @@ void D3D11PipelineStateViewer::setShaderState(const D3D11Pipe::Shader &stage, QL if(stage.Object == ResourceId()) shader->setText(tr("Unbound Shader")); else - shader->setText(ToQStr(stage.name)); + shader->setText(stage.name); if(shaderDetails && !shaderDetails->DebugInfo.files.empty()) { shader->setText(QFormatStr("%1() - %2") - .arg(ToQStr(shaderDetails->EntryPoint)) - .arg(QFileInfo(ToQStr(shaderDetails->DebugInfo.files[0].first)).fileName())); + .arg(shaderDetails->EntryPoint) + .arg(QFileInfo(shaderDetails->DebugInfo.files[0].first).fileName())); } int vs = 0; @@ -914,10 +914,10 @@ void D3D11PipelineStateViewer::setShaderState(const D3D11Pipe::Shader &stage, QL QString slotname = QString::number(i); if(shaderInput && !shaderInput->name.empty()) - slotname += lit(": ") + ToQStr(shaderInput->name); + slotname += lit(": ") + shaderInput->name; if(s.customName) - slotname += QFormatStr("(%1)").arg(ToQStr(s.name)); + slotname += QFormatStr("(%1)").arg(s.name); QString borderColor = QFormatStr("%1, %2, %3, %4") .arg(s.BorderColor[0]) @@ -1033,14 +1033,14 @@ void D3D11PipelineStateViewer::setShaderState(const D3D11Pipe::Shader &stage, QL if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } QString slotname = QString::number(i); if(shaderCBuf && !shaderCBuf->name.empty()) - slotname += lit(": ") + ToQStr(shaderCBuf->name); + slotname += lit(": ") + shaderCBuf->name; QString sizestr; if(bytesize == (uint32_t)length) @@ -1079,10 +1079,9 @@ void D3D11PipelineStateViewer::setShaderState(const D3D11Pipe::Shader &stage, QL QString interfaceName = lit("Interface %1").arg(i); if(shaderDetails && i < shaderDetails->Interfaces.count) - interfaceName = ToQStr(shaderDetails->Interfaces[i]); + interfaceName = shaderDetails->Interfaces[i]; - classes->addTopLevelItem( - new RDTreeWidgetItem({i, interfaceName, ToQStr(stage.ClassInstances[i])})); + classes->addTopLevelItem(new RDTreeWidgetItem({i, interfaceName, stage.ClassInstances[i]})); } classes->clearSelection(); classes->setUpdatesEnabled(true); @@ -1110,10 +1109,10 @@ void D3D11PipelineStateViewer::setState() if(state.m_IA.Bytecode) { - QString layout = ToQStr(state.m_IA.name); + QString layout = state.m_IA.name; if(state.m_IA.Bytecode && !state.m_IA.Bytecode->DebugInfo.files.empty()) - layout += QFormatStr(" (%1)").arg(ToQStr(state.m_IA.Bytecode->EntryPoint)); + layout += QFormatStr(" (%1)").arg(state.m_IA.Bytecode->EntryPoint); ui->iaBytecode->setText(layout); } @@ -1161,11 +1160,11 @@ void D3D11PipelineStateViewer::setState() for(int i = 0; i < count; i++) { - QString IAname = ToQStr(IA[i].semanticIdxName); - QString VSname = ToQStr(VS[i].semanticIdxName); + QString IAname = IA[i].semanticIdxName; + QString VSname = VS[i].semanticIdxName; // misorder or misnamed semantics - if(IAname.toUpper() != VSname.toUpper()) + if(!IAname.compare(VSname, Qt::CaseInsensitive)) mismatchDetails += tr("IA bytecode semantic %1: %2 != VS bytecode semantic %1: %3\n") .arg(i) .arg(IAname) @@ -1234,8 +1233,8 @@ void D3D11PipelineStateViewer::setState() for(int ia = 0; state.m_IA.Bytecode && ia < state.m_IA.Bytecode->InputSig.count; ia++) { - if(ToQStr(state.m_IA.Bytecode->InputSig[ia].semanticName).toUpper() == - ToQStr(l.SemanticName).toUpper() && + if(!QString(state.m_IA.Bytecode->InputSig[ia].semanticName) + .compare(l.SemanticName, Qt::CaseInsensitive) && state.m_IA.Bytecode->InputSig[ia].semanticIndex == l.SemanticIndex) { usedSlot = true; @@ -1245,10 +1244,10 @@ void D3D11PipelineStateViewer::setState() if(showNode(usedSlot, filledSlot)) { - RDTreeWidgetItem *node = new RDTreeWidgetItem( - {i, ToQStr(l.SemanticName), l.SemanticIndex, ToQStr(l.Format.strname), l.InputSlot, - byteOffs, l.PerInstance ? lit("PER_INSTANCE") : lit("PER_VERTEX"), - l.InstanceDataStepRate, QString()}); + RDTreeWidgetItem *node = + new RDTreeWidgetItem({i, l.SemanticName, l.SemanticIndex, l.Format.strname, l.InputSlot, + byteOffs, l.PerInstance ? lit("PER_INSTANCE") : lit("PER_VERTEX"), + l.InstanceDataStepRate, QString()}); if(usedSlot) usedVBuffers[l.InputSlot] = true; @@ -1300,7 +1299,7 @@ void D3D11PipelineStateViewer::setState() if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } @@ -1362,7 +1361,7 @@ void D3D11PipelineStateViewer::setState() BufferDescription *buf = m_Ctx.GetBuffer(v.Buffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } @@ -1454,7 +1453,7 @@ void D3D11PipelineStateViewer::setState() if(buf) { - name = ToQStr(buf->name); + name = buf->name; if(length == 0) length = buf->length; } @@ -1758,10 +1757,9 @@ QString D3D11PipelineStateViewer::formatMembers(int indent, const QString &namep { if(i > 0) ret += lit("\n"); - ret += indentstr + lit("// struct %1\n").arg(ToQStr(v.type.descriptor.name)); - ret += indentstr + lit("{\n") + - formatMembers(indent + 1, ToQStr(v.name) + lit("_"), v.type.members) + indentstr + - lit("}\n"); + ret += indentstr + lit("// struct %1\n").arg(v.type.descriptor.name); + ret += indentstr + lit("{\n") + formatMembers(indent + 1, v.name + lit("_"), v.type.members) + + indentstr + lit("}\n"); if(i < vars.count - 1) ret += lit("\n"); } @@ -1772,9 +1770,9 @@ QString D3D11PipelineStateViewer::formatMembers(int indent, const QString &namep arr = QFormatStr("[%1]").arg(v.type.descriptor.elements); ret += QFormatStr("%1%2 %3%4%5;\n") .arg(indentstr) - .arg(ToQStr(v.type.descriptor.name)) + .arg(v.type.descriptor.name) .arg(nameprefix) - .arg(ToQStr(v.name)) + .arg(v.name) .arg(arr); } @@ -1919,7 +1917,7 @@ void D3D11PipelineStateViewer::resource_itemActivated(RDTreeWidgetItem *item, in if(!res.variableType.members.empty()) { format = lit("// struct %1\n{\n%2}") - .arg(ToQStr(res.variableType.descriptor.name)) + .arg(res.variableType.descriptor.name) .arg(formatMembers(1, QString(), res.variableType.members)); } else @@ -1939,7 +1937,7 @@ void D3D11PipelineStateViewer::resource_itemActivated(RDTreeWidgetItem *item, in format += QString::number(desc.cols); if(!desc.name.empty()) - format += lit(" ") + ToQStr(desc.name); + format += lit(" ") + desc.name; if(desc.elements > 1) format += QFormatStr("[%1]").arg(desc.elements); @@ -2299,7 +2297,7 @@ QVariantList D3D11PipelineStateViewer::exportViewHTML(D3D11Pipe::View &view, int uint32_t h = 1, d = 1; uint32_t a = 0; - QString viewFormat = ToQStr(view.Format.strname); + QString viewFormat = view.Format.strname; TextureDescription *tex = m_Ctx.GetTexture(view.Resource); BufferDescription *buf = m_Ctx.GetBuffer(view.Resource); @@ -2313,8 +2311,8 @@ QVariantList D3D11PipelineStateViewer::exportViewHTML(D3D11Pipe::View &view, int h = tex->height; d = tex->depth; a = tex->arraysize; - format = ToQStr(tex->format.strname); - name = ToQStr(tex->name); + format = tex->format.strname; + name = tex->name; typeName = ToQStr(tex->resType); if(tex->mips > 1) @@ -2336,8 +2334,8 @@ QVariantList D3D11PipelineStateViewer::exportViewHTML(D3D11Pipe::View &view, int h = 0; d = 0; a = 0; - format = ToQStr(view.Format.strname); - name = ToQStr(buf->name); + format = view.Format.strname; + name = buf->name; typeName = lit("Buffer"); if(view.Flags & D3DBufferViewFlags::Raw) @@ -2362,13 +2360,13 @@ QVariantList D3D11PipelineStateViewer::exportViewHTML(D3D11Pipe::View &view, int if(view.Format.compType == CompType::Typeless) { if(shaderInput->variableType.members.count > 0) - viewFormat = format = lit("struct ") + ToQStr(shaderInput->variableType.descriptor.name); + viewFormat = format = lit("struct ") + shaderInput->variableType.descriptor.name; else - viewFormat = format = ToQStr(shaderInput->variableType.descriptor.name); + viewFormat = format = shaderInput->variableType.descriptor.name; } else { - format = ToQStr(view.Format.strname); + format = view.Format.strname; } } @@ -2399,8 +2397,8 @@ void D3D11PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D11Pipe::IA & int i = 0; for(const D3D11Pipe::Layout &l : ia.layouts) { - rows.push_back({i, ToQStr(l.SemanticName), l.SemanticIndex, ToQStr(l.Format.strname), - l.InputSlot, l.ByteOffset, (bool)l.PerInstance, l.InstanceDataStepRate}); + rows.push_back({i, l.SemanticName, l.SemanticIndex, l.Format.strname, l.InputSlot, + l.ByteOffset, (bool)l.PerInstance, l.InstanceDataStepRate}); i++; } @@ -2433,7 +2431,7 @@ void D3D11PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D11Pipe::IA & BufferDescription *buf = m_Ctx.GetBuffer(vb.Buffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } } @@ -2464,7 +2462,7 @@ void D3D11PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D11Pipe::IA & BufferDescription *buf = m_Ctx.GetBuffer(ia.ibuffer.Buffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } } @@ -2499,13 +2497,13 @@ void D3D11PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D11Pipe::Shad if(sh.Object == ResourceId()) shadername = tr("Unbound"); else - shadername = ToQStr(sh.name); + shadername = sh.name; if(shaderDetails && shaderDetails->DebugInfo.files.count > 0) { shadername = QFormatStr("%1() - %2") - .arg(ToQStr(shaderDetails->EntryPoint)) - .arg(QFileInfo(ToQStr(shaderDetails->DebugInfo.files[0].first)).fileName()); + .arg(shaderDetails->EntryPoint) + .arg(QFileInfo(shaderDetails->DebugInfo.files[0].first).fileName()); } xml.writeStartElement(lit("p")); @@ -2659,7 +2657,7 @@ void D3D11PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D11Pipe::Shad BufferDescription *buf = m_Ctx.GetBuffer(sh.ConstantBuffers[i].Buffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } @@ -2686,9 +2684,9 @@ void D3D11PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D11Pipe::Shad QString interfaceName = tr("Interface %1").arg(i); if(sh.ShaderDetails && i < sh.ShaderDetails->Interfaces.count) - interfaceName = ToQStr(sh.ShaderDetails->Interfaces[i]); + interfaceName = sh.ShaderDetails->Interfaces[i]; - rows.push_back({i, interfaceName, ToQStr(sh.ClassInstances[i])}); + rows.push_back({i, interfaceName, sh.ClassInstances[i]}); } m_Common.exportHTMLTable(xml, @@ -2723,7 +2721,7 @@ void D3D11PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D11Pipe::SO & BufferDescription *buf = m_Ctx.GetBuffer(o.Buffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } } diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp index 8533f4d75..897f94ba2 100644 --- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp @@ -509,7 +509,7 @@ void D3D12PipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const D3D1 { if(im.id == tex->ID) { - text += tr("Texture is in the '%1' state\n\n").arg(ToQStr(im.states[0].name)); + text += tr("Texture is in the '%1' state\n\n").arg(im.states[0].name); break; } } @@ -517,8 +517,8 @@ void D3D12PipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const D3D1 if(res.Format != tex->format) { text += tr("The texture is format %1, the view treats it as %2.\n") - .arg(ToQStr(tex->format.strname)) - .arg(ToQStr(res.Format.strname)); + .arg(tex->format.strname) + .arg(res.Format.strname); viewdetails = true; } @@ -585,7 +585,7 @@ void D3D12PipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const D3D1 { if(im.id == buf->ID) { - text += tr("Buffer is in the '%1' state\n\n").arg(ToQStr(im.states[0].name)); + text += tr("Buffer is in the '%1' state\n\n").arg(im.states[0].name); break; } } @@ -677,7 +677,7 @@ void D3D12PipelineStateViewer::addResourceRow(const D3D12ViewTag &view, QString regname = QString::number(view.reg); if(shaderInput && !shaderInput->name.empty()) - regname += lit(": ") + ToQStr(shaderInput->name); + regname += lit(": ") + shaderInput->name; if(view.space == D3D12ViewTag::OMDepth) regname = tr("Depth"); @@ -704,8 +704,8 @@ void D3D12PipelineStateViewer::addResourceRow(const D3D12ViewTag &view, h = tex->height; d = tex->depth; a = tex->arraysize; - format = ToQStr(tex->format.strname); - name = ToQStr(tex->name); + format = tex->format.strname; + name = tex->name; typeName = ToQStr(tex->resType); if(tex->resType == TextureDim::Texture2DMS || tex->resType == TextureDim::Texture2DMSArray) @@ -714,7 +714,7 @@ void D3D12PipelineStateViewer::addResourceRow(const D3D12ViewTag &view, } if(tex->format != r.Format) - format = tr("Viewed as %1").arg(ToQStr(r.Format.strname)); + format = tr("Viewed as %1").arg(r.Format.strname); if(HasImportantViewParams(r, tex)) viewDetails = true; @@ -729,7 +729,7 @@ void D3D12PipelineStateViewer::addResourceRow(const D3D12ViewTag &view, d = 0; a = 0; format = QString(); - name = ToQStr(buf->name); + name = buf->name; typeName = lit("Buffer"); if(r.BufferFlags & D3DBufferViewFlags::Raw) @@ -752,11 +752,11 @@ void D3D12PipelineStateViewer::addResourceRow(const D3D12ViewTag &view, if(shaderInput && !shaderInput->IsTexture) { if(!shaderInput->variableType.members.empty()) - format = lit("struct ") + ToQStr(shaderInput->variableType.descriptor.name); + format = lit("struct ") + shaderInput->variableType.descriptor.name; else if(r.Format.compType == CompType::Typeless) - format = ToQStr(shaderInput->variableType.descriptor.name); + format = shaderInput->variableType.descriptor.name; else - format = ToQStr(r.Format.strname); + format = r.Format.strname; } if(HasImportantViewParams(r, buf)) @@ -918,16 +918,15 @@ void D3D12PipelineStateViewer::setShaderState(const D3D12Pipe::Shader &stage, QL shader->setText(tr("Unbound Shader")); else if(state.customName) shader->setText( - QFormatStr("%1 - %2").arg(ToQStr(state.name)).arg(m_Ctx.CurPipelineState().Abbrev(stage.stage))); + QFormatStr("%1 - %2").arg(state.name).arg(m_Ctx.CurPipelineState().Abbrev(stage.stage))); else - shader->setText( - tr("%1 - %2 Shader").arg(ToQStr(state.name)).arg(ToQStr(stage.stage, GraphicsAPI::D3D12))); + shader->setText(tr("%1 - %2 Shader").arg(state.name).arg(ToQStr(stage.stage, GraphicsAPI::D3D12))); if(shaderDetails && !shaderDetails->DebugInfo.files.empty()) { shader->setText(QFormatStr("%1() - %2") - .arg(ToQStr(shaderDetails->EntryPoint)) - .arg(QFileInfo(ToQStr(shaderDetails->DebugInfo.files[0].first)).fileName())); + .arg(shaderDetails->EntryPoint) + .arg(QFileInfo(shaderDetails->DebugInfo.files[0].first).fileName())); } int vs = 0; @@ -1013,7 +1012,7 @@ void D3D12PipelineStateViewer::setShaderState(const D3D12Pipe::Shader &stage, QL QString regname = QString::number(reg); if(shaderInput && !shaderInput->name.empty()) - regname += lit(": ") + ToQStr(shaderInput->name); + regname += lit(": ") + shaderInput->name; QString borderColor = QFormatStr("%1, %2, %3, %4") .arg(s.BorderColor[0]) @@ -1161,12 +1160,12 @@ void D3D12PipelineStateViewer::setShaderState(const D3D12Pipe::Shader &stage, QL BufferDescription *buf = m_Ctx.GetBuffer(b.Buffer); if(buf) - name = ToQStr(buf->name); + name = buf->name; QString regname = QString::number(reg); if(shaderCBuf && !shaderCBuf->name.empty()) - regname += lit(": ") + ToQStr(shaderCBuf->name); + regname += lit(": ") + shaderCBuf->name; QString sizestr; if(bytesize == (uint32_t)length) @@ -1246,8 +1245,8 @@ void D3D12PipelineStateViewer::setState() for(int ia = 0; state.m_VS.ShaderDetails && ia < state.m_VS.ShaderDetails->InputSig.count; ia++) { - if(ToQStr(state.m_VS.ShaderDetails->InputSig[ia].semanticName).toUpper() == - ToQStr(l.SemanticName).toUpper() && + if(!QString(state.m_VS.ShaderDetails->InputSig[ia].semanticName) + .compare(l.SemanticName, Qt::CaseInsensitive) && state.m_VS.ShaderDetails->InputSig[ia].semanticIndex == l.SemanticIndex) { usedSlot = true; @@ -1257,10 +1256,10 @@ void D3D12PipelineStateViewer::setState() if(showNode(usedSlot, filledSlot)) { - RDTreeWidgetItem *node = new RDTreeWidgetItem( - {i, ToQStr(l.SemanticName), l.SemanticIndex, ToQStr(l.Format.strname), l.InputSlot, - byteOffs, l.PerInstance ? lit("PER_INSTANCE") : lit("PER_VERTEX"), - l.InstanceDataStepRate, QString()}); + RDTreeWidgetItem *node = + new RDTreeWidgetItem({i, l.SemanticName, l.SemanticIndex, l.Format.strname, l.InputSlot, + byteOffs, l.PerInstance ? lit("PER_INSTANCE") : lit("PER_VERTEX"), + l.InstanceDataStepRate, QString()}); if(usedSlot) usedVBuffers[l.InputSlot] = true; @@ -1312,7 +1311,7 @@ void D3D12PipelineStateViewer::setState() if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } @@ -1374,7 +1373,7 @@ void D3D12PipelineStateViewer::setState() BufferDescription *buf = m_Ctx.GetBuffer(v.Buffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } @@ -1441,7 +1440,7 @@ void D3D12PipelineStateViewer::setState() if(buf) { - name = ToQStr(buf->name); + name = buf->name; if(length == 0) length = buf->length; } @@ -1659,10 +1658,9 @@ QString D3D12PipelineStateViewer::formatMembers(int indent, const QString &namep { if(i > 0) ret += lit("\n"); - ret += indentstr + lit("// struct %1\n").arg(ToQStr(v.type.descriptor.name)); - ret += indentstr + lit("{\n") + - formatMembers(indent + 1, ToQStr(v.name) + lit("_"), v.type.members) + indentstr + - lit("}\n"); + ret += indentstr + lit("// struct %1\n").arg(v.type.descriptor.name); + ret += indentstr + lit("{\n") + formatMembers(indent + 1, v.name + lit("_"), v.type.members) + + indentstr + lit("}\n"); if(i < vars.count - 1) ret += lit("\n"); } @@ -1673,9 +1671,9 @@ QString D3D12PipelineStateViewer::formatMembers(int indent, const QString &namep arr = QFormatStr("[%1]").arg(v.type.descriptor.elements); ret += QFormatStr("%1%2 %3%4%5;\n") .arg(indentstr) - .arg(ToQStr(v.type.descriptor.name)) + .arg(v.type.descriptor.name) .arg(nameprefix) - .arg(ToQStr(v.name)) + .arg(v.name) .arg(arr); } @@ -1792,7 +1790,7 @@ void D3D12PipelineStateViewer::resource_itemActivated(RDTreeWidgetItem *item, in if(!res.variableType.members.empty()) { format = QFormatStr("// struct %1\n{\n%2}") - .arg(ToQStr(res.variableType.descriptor.name)) + .arg(res.variableType.descriptor.name) .arg(formatMembers(1, QString(), res.variableType.members)); } else @@ -1812,7 +1810,7 @@ void D3D12PipelineStateViewer::resource_itemActivated(RDTreeWidgetItem *item, in format += desc.cols; if(!desc.name.empty()) - format += lit(" ") + ToQStr(desc.name); + format += lit(" ") + desc.name; if(desc.elements > 1) format += QFormatStr("[%1]").arg(desc.elements); @@ -2142,7 +2140,7 @@ QVariantList D3D12PipelineStateViewer::exportViewHTML(const D3D12Pipe::View &vie uint32_t h = 1, d = 1; uint32_t a = 0; - QString viewFormat = ToQStr(view.Format.strname); + QString viewFormat = view.Format.strname; TextureDescription *tex = m_Ctx.GetTexture(view.Resource); BufferDescription *buf = m_Ctx.GetBuffer(view.Resource); @@ -2156,8 +2154,8 @@ QVariantList D3D12PipelineStateViewer::exportViewHTML(const D3D12Pipe::View &vie h = tex->height; d = tex->depth; a = tex->arraysize; - format = ToQStr(tex->format.strname); - name = ToQStr(tex->name); + format = tex->format.strname; + name = tex->name; typeName = ToQStr(tex->resType); if(view.swizzle[0] != TextureSwizzle::Red || view.swizzle[1] != TextureSwizzle::Green || @@ -2196,8 +2194,8 @@ QVariantList D3D12PipelineStateViewer::exportViewHTML(const D3D12Pipe::View &vie h = 0; d = 0; a = 0; - format = ToQStr(view.Format.strname); - name = ToQStr(buf->name); + format = view.Format.strname; + name = buf->name; typeName = lit("Buffer"); if(view.BufferFlags & D3DBufferViewFlags::Raw) @@ -2222,13 +2220,13 @@ QVariantList D3D12PipelineStateViewer::exportViewHTML(const D3D12Pipe::View &vie if(view.Format.compType == CompType::Typeless) { if(shaderInput->variableType.members.count > 0) - viewFormat = format = lit("struct ") + ToQStr(shaderInput->variableType.descriptor.name); + viewFormat = format = lit("struct ") + shaderInput->variableType.descriptor.name; else - viewFormat = format = ToQStr(shaderInput->variableType.descriptor.name); + viewFormat = format = shaderInput->variableType.descriptor.name; } else { - format = ToQStr(view.Format.strname); + format = view.Format.strname; } } @@ -2242,7 +2240,7 @@ QVariantList D3D12PipelineStateViewer::exportViewHTML(const D3D12Pipe::View &vie QString counterName = tr("Buffer %1").arg(ToQStr(view.CounterResource)); BufferDescription *counterBuf = m_Ctx.GetBuffer(view.CounterResource); if(counterBuf) - counterName = ToQStr(counterBuf->name); + counterName = counterBuf->name; viewParams += tr(", Counter in %1 at %2 bytes").arg(counterName).arg(view.CounterByteOffset); } } @@ -2268,8 +2266,8 @@ void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D12Pipe::IA & int i = 0; for(const D3D12Pipe::Layout &l : ia.layouts) { - rows.push_back({i, ToQStr(l.SemanticName), l.SemanticIndex, ToQStr(l.Format.strname), - l.InputSlot, l.ByteOffset, (bool)l.PerInstance, l.InstanceDataStepRate}); + rows.push_back({i, l.SemanticName, l.SemanticIndex, l.Format.strname, l.InputSlot, + l.ByteOffset, (bool)l.PerInstance, l.InstanceDataStepRate}); i++; } @@ -2302,7 +2300,7 @@ void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D12Pipe::IA & BufferDescription *buf = m_Ctx.GetBuffer(vb.Buffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } } @@ -2335,7 +2333,7 @@ void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D12Pipe::IA & BufferDescription *buf = m_Ctx.GetBuffer(ia.ibuffer.Buffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } } @@ -2375,16 +2373,15 @@ void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D12Pipe::Shad shadername = tr("Unbound"); else if(state.customName) shadername = - QFormatStr("%1 - %2").arg(ToQStr(state.name)).arg(m_Ctx.CurPipelineState().Abbrev(sh.stage)); + QFormatStr("%1 - %2").arg(state.name).arg(m_Ctx.CurPipelineState().Abbrev(sh.stage)); else - shadername = - tr("%1 - %2 Shader").arg(ToQStr(state.name)).arg(ToQStr(sh.stage, GraphicsAPI::D3D12)); + shadername = tr("%1 - %2 Shader").arg(state.name).arg(ToQStr(sh.stage, GraphicsAPI::D3D12)); if(shaderDetails && !shaderDetails->DebugInfo.files.empty()) { shadername = QFormatStr("%1() - %2") - .arg(ToQStr(shaderDetails->EntryPoint)) - .arg(QFileInfo(ToQStr(shaderDetails->DebugInfo.files[0].first)).fileName()); + .arg(shaderDetails->EntryPoint) + .arg(QFileInfo(shaderDetails->DebugInfo.files[0].first).fileName()); } xml.writeStartElement(lit("p")); @@ -2568,7 +2565,7 @@ void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D12Pipe::Shad QString regname = QString::number(reg); if(shaderInput && !shaderInput->name.empty()) - regname += lit(": ") + ToQStr(shaderInput->name); + regname += lit(": ") + shaderInput->name; QString borderColor = QFormatStr("%1, %2, %3, %4") .arg(s.BorderColor[0]) @@ -2695,14 +2692,14 @@ void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D12Pipe::Shad BufferDescription *buf = m_Ctx.GetBuffer(b.Buffer); if(buf) - name = ToQStr(buf->name); + name = buf->name; else name = tr("Empty"); QString regname = QString::number(reg); if(shaderCBuf && !shaderCBuf->name.empty()) - regname += lit(": ") + ToQStr(shaderCBuf->name); + regname += lit(": ") + shaderCBuf->name; length = qMin(length, (uint64_t)bytesize); @@ -2745,7 +2742,7 @@ void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D12Pipe::Stre BufferDescription *buf = m_Ctx.GetBuffer(o.Buffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } } @@ -2759,7 +2756,7 @@ void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D12Pipe::Stre BufferDescription *buf = m_Ctx.GetBuffer(o.WrittenCountBuffer); if(buf) { - counterName = ToQStr(buf->name); + counterName = buf->name; counterLength = buf->length; } } diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp index 3a16d75dd..8b153025d 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp @@ -595,13 +595,13 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, QLabel * else { if(stage.customShaderName) - shaderName = ToQStr(stage.ShaderName); + shaderName = stage.ShaderName; if(stage.customProgramName) - shaderName = ToQStr(stage.ProgramName) + lit(" - ") + shaderName; + shaderName = stage.ProgramName + lit(" - ") + shaderName; if(stage.customPipelineName && stage.PipelineActive) - shaderName = ToQStr(stage.PipelineName) + lit(" - ") + shaderName; + shaderName = stage.PipelineName + lit(" - ") + shaderName; shader->setText(shaderName); } @@ -648,7 +648,7 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, QLabel * QString slotname = QString::number(i); if(shaderInput && !shaderInput->name.empty()) - slotname += lit(": ") + ToQStr(shaderInput->name); + slotname += lit(": ") + shaderInput->name; uint32_t w = 1, h = 1, d = 1; uint32_t a = 1; @@ -672,8 +672,8 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, QLabel * h = tex->height; d = tex->depth; a = tex->arraysize; - format = ToQStr(tex->format.strname); - name = ToQStr(tex->name); + format = tex->format.strname; + name = tex->name; typeName = ToQStr(tex->resType); if(tex->format.special && (tex->format.specialFormat == SpecialFormat::D16S8 || @@ -715,7 +715,7 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, QLabel * QString slotname = QString::number(i); if(shaderInput && !shaderInput->name.empty()) - slotname += lit(": ") + ToQStr(shaderInput->name); + slotname += lit(": ") + shaderInput->name; QString borderColor = QFormatStr("%1, %2, %3, %4") .arg(s.BorderColor[0]) @@ -830,7 +830,7 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, QLabel * if(b) { - slotname = QFormatStr("%1: %2").arg(bindPoint).arg(ToQStr(shaderCBuf.name)); + slotname = QFormatStr("%1: %2").arg(bindPoint).arg(shaderCBuf.name); name = lit("UBO ") + ToQStr(b->Resource); offset = b->Offset; length = b->Size; @@ -838,7 +838,7 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, QLabel * BufferDescription *buf = m_Ctx.GetBuffer(b->Resource); if(buf) { - name = ToQStr(buf->name); + name = buf->name; if(length == 0) length = buf->length; } @@ -929,7 +929,7 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, QLabel * ? tr("Atomic") : readWriteType == GLReadWriteType::SSBO ? tr("SSBO") : tr("Unknown"); - QString slotname = QFormatStr("%1: %2").arg(bindPoint).arg(ToQStr(res.name)); + QString slotname = QFormatStr("%1: %2").arg(bindPoint).arg(res.name); QString name; QString dimensions; QString format = lit("-"); @@ -940,7 +940,7 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, QLabel * access = tr("Read-Only"); if(!im->readAllowed && im->writeAllowed) access = tr("Write-Only"); - format = ToQStr(im->Format.strname); + format = im->Format.strname; } QVariant tag; @@ -968,7 +968,7 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, QLabel * dimensions = QFormatStr("%1x%2x%3").arg(tex->width).arg(tex->height).arg(tex->depth); } - name = ToQStr(tex->name); + name = tex->name; tag = QVariant::fromValue(id); } @@ -990,7 +990,7 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, QLabel * else dimensions = tr("%1 bytes").arg(length); - name = ToQStr(buf->name); + name = buf->name; tag = QVariant::fromValue(GLReadWriteTag(i, id, offset, length)); } @@ -1130,7 +1130,7 @@ void GLPipelineStateViewer::setState() if(attrib >= 0 && attrib < state.m_VS.ShaderDetails->InputSig.count) { - name = ToQStr(state.m_VS.ShaderDetails->InputSig[attrib].varName); + name = state.m_VS.ShaderDetails->InputSig[attrib].varName; compCount = state.m_VS.ShaderDetails->InputSig[attrib].compCount; compType = state.m_VS.ShaderDetails->InputSig[attrib].compType; usedSlot = true; @@ -1143,7 +1143,7 @@ void GLPipelineStateViewer::setState() RDTreeWidgetItem *node = new RDTreeWidgetItem( {i, a.Enabled ? tr("Enabled") : tr("Disabled"), name, - a.Enabled ? ToQStr(a.Format.strname) : genericVal, a.BufferSlot, a.RelativeOffset}); + a.Enabled ? a.Format.strname : genericVal, a.BufferSlot, a.RelativeOffset}); if(a.Enabled) usedBindings[a.BufferSlot] = true; @@ -1209,7 +1209,7 @@ void GLPipelineStateViewer::setState() if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } @@ -1272,7 +1272,7 @@ void GLPipelineStateViewer::setState() BufferDescription *buf = m_Ctx.GetBuffer(v.Buffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } @@ -1334,7 +1334,7 @@ void GLPipelineStateViewer::setState() if(buf) { - name = ToQStr(buf->name); + name = buf->name; if(length == 0) length = buf->length; } @@ -1651,8 +1651,8 @@ void GLPipelineStateViewer::setState() h = tex->height; d = tex->depth; a = tex->arraysize; - format = ToQStr(tex->format.strname); - name = ToQStr(tex->name); + format = tex->format.strname; + name = tex->name; typeName = ToQStr(tex->resType); if(tex->format.srgbCorrected && !state.m_FB.FramebufferSRGB) @@ -1666,7 +1666,7 @@ void GLPipelineStateViewer::setState() (state.m_FS.ShaderDetails->OutputSig[s].systemValue == ShaderBuiltin::Undefined || state.m_FS.ShaderDetails->OutputSig[s].systemValue == ShaderBuiltin::ColorOutput)) { - name = QFormatStr("<%1>").arg(ToQStr(state.m_FS.ShaderDetails->OutputSig[s].varName)); + name = QFormatStr("<%1>").arg(state.m_FS.ShaderDetails->OutputSig[s].varName); } } } @@ -1736,8 +1736,8 @@ void GLPipelineStateViewer::setState() h = tex->height; d = tex->depth; a = tex->arraysize; - format = ToQStr(tex->format.strname); - name = ToQStr(tex->name); + format = tex->format.strname; + name = tex->name; typeName = ToQStr(tex->resType); } @@ -1930,10 +1930,9 @@ QString GLPipelineStateViewer::formatMembers(int indent, const QString &namepref { if(i > 0) ret += lit("\n"); - ret += indentstr + QFormatStr("// struct %1\n").arg(ToQStr(v.type.descriptor.name)); - ret += indentstr + lit("{\n") + - formatMembers(indent + 1, ToQStr(v.name) + lit("_"), v.type.members) + indentstr + - lit("}\n"); + ret += indentstr + QFormatStr("// struct %1\n").arg(v.type.descriptor.name); + ret += indentstr + lit("{\n") + formatMembers(indent + 1, v.name + lit("_"), v.type.members) + + indentstr + lit("}\n"); if(i < vars.count - 1) ret += lit("\n"); } @@ -1944,9 +1943,9 @@ QString GLPipelineStateViewer::formatMembers(int indent, const QString &namepref arr = QFormatStr("[%1]").arg(v.type.descriptor.elements); ret += QFormatStr("%1%2 %3%4%5;\n") .arg(indentstr) - .arg(ToQStr(v.type.descriptor.name)) + .arg(v.type.descriptor.name) .arg(nameprefix) - .arg(ToQStr(v.name)) + .arg(v.name) .arg(arr); } @@ -1994,15 +1993,15 @@ void GLPipelineStateViewer::resource_itemActivated(RDTreeWidgetItem *item, int c const ShaderResource &shaderRes = stage->ShaderDetails->ReadWriteResources[buf.bindPoint]; - QString format = lit("// struct %1\n").arg(ToQStr(shaderRes.variableType.descriptor.name)); + QString format = lit("// struct %1\n").arg(shaderRes.variableType.descriptor.name); if(shaderRes.variableType.members.count > 1) { format += tr("// members skipped as they are fixed size:\n"); for(int i = 0; i < shaderRes.variableType.members.count - 1; i++) format += QFormatStr("%1 %2;\n") - .arg(ToQStr(shaderRes.variableType.members[i].type.descriptor.name)) - .arg(ToQStr(shaderRes.variableType.members[i].name)); + .arg(shaderRes.variableType.members[i].type.descriptor.name) + .arg(shaderRes.variableType.members[i].name); } if(!shaderRes.variableType.members.empty()) @@ -2026,7 +2025,7 @@ void GLPipelineStateViewer::resource_itemActivated(RDTreeWidgetItem *item, int c format += desc.cols; if(!desc.name.empty()) - format += lit(" ") + ToQStr(desc.name); + format += lit(" ") + desc.name; if(desc.elements > 1) format += QFormatStr("[%1]").arg(desc.elements); @@ -2281,8 +2280,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::VertexInpu QString generic; if(!a.Enabled) generic = MakeGenericValueString(a.Format.compCount, a.Format.compType, a); - rows.push_back( - {i, (bool)a.Enabled, a.BufferSlot, ToQStr(a.Format.strname), a.RelativeOffset, generic}); + rows.push_back({i, (bool)a.Enabled, a.BufferSlot, a.Format.strname, a.RelativeOffset, generic}); i++; } @@ -2314,7 +2312,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::VertexInpu BufferDescription *buf = m_Ctx.GetBuffer(vb.Buffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } } @@ -2346,7 +2344,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::VertexInpu BufferDescription *buf = m_Ctx.GetBuffer(vtx.ibuffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } } @@ -2437,7 +2435,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::Shader &sh if(sh.Object == ResourceId()) shadername = tr("Unbound"); else - shadername = ToQStr(sh.ShaderName); + shadername = sh.ShaderName; if(sh.Object == ResourceId()) { @@ -2454,13 +2452,13 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::Shader &sh else { if(sh.customShaderName) - shname = ToQStr(sh.ShaderName); + shname = sh.ShaderName; if(sh.customProgramName) - shname = QFormatStr("%1 - %2").arg(ToQStr(sh.ProgramName)).arg(shname); + shname = QFormatStr("%1 - %2").arg(sh.ProgramName).arg(shname); if(sh.customPipelineName && sh.PipelineActive) - shname = QFormatStr("%1 - %2").arg(ToQStr(sh.PipelineName)).arg(shname); + shname = QFormatStr("%1 - %2").arg(sh.PipelineName).arg(shname); shadername = shname; } @@ -2510,7 +2508,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::Shader &sh QString slotname = QString::number(i); if(shaderInput && shaderInput->name.count > 0) - slotname += QFormatStr(": %1").arg(ToQStr(shaderInput->name)); + slotname += QFormatStr(": %1").arg(shaderInput->name); uint32_t w = 1, h = 1, d = 1; uint32_t a = 1; @@ -2533,8 +2531,8 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::Shader &sh h = tex->height; d = tex->depth; a = tex->arraysize; - format = ToQStr(tex->format.strname); - name = ToQStr(tex->name); + format = tex->format.strname; + name = tex->name; typeName = ToQStr(tex->resType); if(tex->format.special && (tex->format.specialFormat == SpecialFormat::D16S8 || @@ -2565,7 +2563,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::Shader &sh QString slotname = QString::number(i); if(shaderInput && shaderInput->name.count > 0) - slotname += QFormatStr(": %1").arg(ToQStr(shaderInput->name)); + slotname += QFormatStr(": %1").arg(shaderInput->name); QString borderColor = QFormatStr("%1, %2, %3, %4") .arg(s.BorderColor[0]) @@ -2664,7 +2662,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::Shader &sh if(b) { - slotname = QFormatStr("%1: %2").arg(bindPoint).arg(ToQStr(shaderCBuf.name)); + slotname = QFormatStr("%1: %2").arg(bindPoint).arg(shaderCBuf.name); name = tr("UBO %1").arg(ToQStr(b->Resource)); offset = b->Offset; length = b->Size; @@ -2672,7 +2670,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::Shader &sh BufferDescription *buf = m_Ctx.GetBuffer(b->Resource); if(buf) { - name = ToQStr(buf->name); + name = buf->name; if(length == 0) length = buf->length; } @@ -2747,7 +2745,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::Shader &sh ? tr("Atomic") : readWriteType == GLReadWriteType::SSBO ? tr("SSBO") : tr("Unknown"); - QString slotname = QFormatStr("%1: %2").arg(bindPoint).arg(ToQStr(res.name)); + QString slotname = QFormatStr("%1: %2").arg(bindPoint).arg(res.name); QString name; QString dimensions; QString format = lit("-"); @@ -2758,7 +2756,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::Shader &sh access = tr("Read-Only"); if(!im->readAllowed && im->writeAllowed) access = tr("Write-Only"); - format = ToQStr(im->Format.strname); + format = im->Format.strname; } // check to see if it's a texture @@ -2785,7 +2783,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::Shader &sh dimensions = QFormatStr("%1x%2x%3").arg(tex->width).arg(tex->height).arg(tex->depth); } - name = ToQStr(tex->name); + name = tex->name; } // if not a texture, it must be a buffer @@ -2805,7 +2803,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::Shader &sh else dimensions = tr("%1 bytes").arg(length); - name = ToQStr(buf->name); + name = buf->name; } if(!filledSlot) @@ -2906,7 +2904,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::Feedback & BufferDescription *buf = m_Ctx.GetBuffer(xfb.BufferBinding[i]); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } } @@ -3167,7 +3165,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::FrameBuffe QString name = tr("Image %1").arg(ToQStr(a.Obj)); if(tex) - name = ToQStr(tex->name); + name = tex->name; if(a.Obj == ResourceId()) name = tr("Empty"); @@ -3227,7 +3225,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::FrameBuffe QString name = tr("Image %1").arg(ToQStr(a.Obj)); if(tex) - name = ToQStr(tex->name); + name = tex->name; if(a.Obj == ResourceId()) name = tr("Empty"); diff --git a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp index 9b9b77d1c..aa68e0982 100644 --- a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp @@ -304,10 +304,10 @@ div.stage table tr td { border-right: 1px solid #AAAAAA; background-color: #EEEE for(const DrawcallDescription *d : drawstack) { - context += QFormatStr(" > %1").arg(ToQStr(d->name)); + context += QFormatStr(" > %1").arg(d->name); } - context += QFormatStr(" => %1").arg(ToQStr(draw->name)); + context += QFormatStr(" => %1").arg(draw->name); xml.writeCharacters(context); } @@ -544,24 +544,24 @@ bool PipelineStateViewer::PrepareShaderEditing(const ShaderReflection *shaderDet { if(!shaderDetails->DebugInfo.files.empty()) { - entryFunc = ToQStr(shaderDetails->EntryPoint); + entryFunc = shaderDetails->EntryPoint; QStringList uniqueFiles; for(auto &s : shaderDetails->DebugInfo.files) { - QString filename = ToQStr(s.first); + QString filename = s.first; if(uniqueFiles.contains(filename.toLower())) { - qWarning() << lit("Duplicate full filename") << ToQStr(s.first); + qWarning() << lit("Duplicate full filename") << QString(s.first); continue; } uniqueFiles.push_back(filename.toLower()); - files[filename] = ToQStr(s.second); + files[filename] = s.second; } - mainfile = ToQStr(shaderDetails->DebugInfo.files[0].first); + mainfile = shaderDetails->DebugInfo.files[0].first; return true; } @@ -577,7 +577,7 @@ void PipelineStateViewer::MakeShaderVariablesHLSL(bool cbufferContents, { if(v.type.members.count > 0) { - QString def = lit("struct %1 {\n").arg(ToQStr(v.type.descriptor.name)); + QString def = lit("struct %1 {\n").arg(v.type.descriptor.name); if(!struct_defs.contains(def)) { @@ -588,7 +588,7 @@ void PipelineStateViewer::MakeShaderVariablesHLSL(bool cbufferContents, } } - struct_contents += lit("\t%1 %2").arg(ToQStr(v.type.descriptor.name)).arg(ToQStr(v.name)); + struct_contents += lit("\t%1 %2").arg(v.type.descriptor.name).arg(v.name); char comp = 'x'; if(v.reg.comp == 1) @@ -628,7 +628,7 @@ QString PipelineStateViewer::GenerateHLSLStub(const ShaderReflection *shaderDeta { hlsl += lit("//SamplerComparisonState %1 : register(s%2); // can't disambiguate\n" "SamplerState %1 : register(s%2); // can't disambiguate\n") - .arg(ToQStr(res.name)) + .arg(res.name) .arg(res.bindPoint); } else @@ -645,8 +645,8 @@ QString PipelineStateViewer::GenerateHLSLStub(const ShaderReflection *shaderDeta { hlsl += lit("%1<%2> %3 : register(%4%5);\n") .arg(textureDim[(size_t)res.resType]) - .arg(ToQStr(res.variableType.descriptor.name)) - .arg(ToQStr(res.name)) + .arg(res.variableType.descriptor.name) + .arg(res.name) .arg(QLatin1Char(regChar)) .arg(res.bindPoint); } @@ -656,8 +656,8 @@ QString PipelineStateViewer::GenerateHLSLStub(const ShaderReflection *shaderDeta hlsl += lit("Structured"); hlsl += lit("Buffer<%1> %2 : register(%3%4);\n") - .arg(ToQStr(res.variableType.descriptor.name)) - .arg(ToQStr(res.name)) + .arg(res.variableType.descriptor.name) + .arg(res.name) .arg(QLatin1Char(regChar)) .arg(res.bindPoint); } @@ -674,7 +674,7 @@ QString PipelineStateViewer::GenerateHLSLStub(const ShaderReflection *shaderDeta { if(cbuf.name.count > 0 && cbuf.variables.count > 0) { - QString cbufName = ToQStr(cbuf.name); + QString cbufName = cbuf.name; if(cbufName == lit("$Globals")) cbufName = lit("_Globals"); cbuffers += lit("cbuffer %1 : register(b%2) {\n").arg(cbufName).arg(cbuf.bindPoint); @@ -692,7 +692,7 @@ QString PipelineStateViewer::GenerateHLSLStub(const ShaderReflection *shaderDeta for(const SigParameter &sig : shaderDetails->InputSig) hlsl += lit("\t%1 %2 : %3;\n") .arg(TypeString(sig)) - .arg(sig.varName.count > 0 ? ToQStr(sig.varName) : lit("param%1").arg(sig.regIndex)) + .arg(sig.varName.count > 0 ? sig.varName : lit("param%1").arg(sig.regIndex)) .arg(D3DSemanticString(sig)); hlsl += lit("};\n\n"); @@ -700,7 +700,7 @@ QString PipelineStateViewer::GenerateHLSLStub(const ShaderReflection *shaderDeta for(const SigParameter &sig : shaderDetails->OutputSig) hlsl += lit("\t%1 %2 : %3;\n") .arg(TypeString(sig)) - .arg(sig.varName.count > 0 ? ToQStr(sig.varName) : lit("param%1").arg(sig.regIndex)) + .arg(sig.varName.count > 0 ? sig.varName : lit("param%1").arg(sig.regIndex)) .arg(D3DSemanticString(sig)); hlsl += lit("};\n\n"); @@ -834,7 +834,7 @@ void PipelineStateViewer::EditShader(ShaderStage shaderType, ResourceId id, std::tie(to, errs) = r->BuildTargetShader( entryFunc.toUtf8().data(), compileSource.toUtf8().data(), flags, shaderType); - GUIInvoke::call([viewer, errs]() { viewer->ShowErrors(ToQStr(errs)); }); + GUIInvoke::call([viewer, errs]() { viewer->ShowErrors(errs); }); if(to == ResourceId()) { r->RemoveReplacement(from); diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp index a0139ad6e..a5e35cec9 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp @@ -390,7 +390,7 @@ void VulkanPipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const bin { if(im.image == tex->ID) { - text += tr("Texture is in the '%1' layout\n\n").arg(ToQStr(im.layouts[0].name)); + text += tr("Texture is in the '%1' layout\n\n").arg(im.layouts[0].name); break; } } @@ -398,8 +398,8 @@ void VulkanPipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const bin if(view.viewfmt != tex->format) { text += tr("The texture is format %1, the view treats it as %2.\n") - .arg(ToQStr(tex->format.strname)) - .arg(ToQStr(view.viewfmt.strname)); + .arg(tex->format.strname) + .arg(view.viewfmt.strname); viewdetails = true; } @@ -654,7 +654,7 @@ QVariantList VulkanPipelineStateViewer::makeSampler(const QString &bindset, cons bindset, slotname, descriptor.immutableSampler ? tr("Immutable Sampler") : tr("Sampler"), - ToQStr(descriptor.name), + descriptor.name, addressing, filter + lit(", ") + lod}; } @@ -755,7 +755,7 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails, QString slotname = QString::number(bind); if(shaderRes != NULL && shaderRes->name.count > 0) - slotname += lit(": ") + ToQStr(shaderRes->name); + slotname += lit(": ") + shaderRes->name; int arrayLength = 0; if(slotBinds != NULL) @@ -792,7 +792,7 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails, if(arrayLength > 1) { if(shaderRes != NULL && shaderRes->name.count > 0) - slotname = QFormatStr("%1[%2]: %3").arg(bind).arg(idx).arg(ToQStr(shaderRes->name)); + slotname = QFormatStr("%1[%2]: %3").arg(bind).arg(idx).arg(shaderRes->name); else slotname = QFormatStr("%1[%2]").arg(bind).arg(idx); } @@ -816,7 +816,7 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails, { name = tr("Object %1").arg(ToQStr(descriptorBind->res)); - format = ToQStr(descriptorBind->viewfmt.strname); + format = descriptorBind->viewfmt.strname; // check to see if it's a texture tex = m_Ctx.GetTexture(descriptorBind->res); @@ -826,7 +826,7 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails, h = tex->height; d = tex->depth; a = tex->arraysize; - name = ToQStr(tex->name); + name = tex->name; restype = tex->resType; samples = tex->msSamp; @@ -842,7 +842,7 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails, h = 0; d = 0; a = 0; - name = ToQStr(buf->name); + name = buf->name; restype = TextureDim::Buffer; if(descriptorLen == UINT64_MAX) @@ -1096,7 +1096,7 @@ void VulkanPipelineStateViewer::addConstantBlockRow(ShaderReflection *shaderDeta QString slotname = QString::number(bind); if(cblock != NULL && cblock->name.count > 0) - slotname += lit(": ") + ToQStr(cblock->name); + slotname += lit(": ") + cblock->name; int arrayLength = 0; if(slotBinds != NULL) @@ -1130,7 +1130,7 @@ void VulkanPipelineStateViewer::addConstantBlockRow(ShaderReflection *shaderDeta if(arrayLength > 1) { if(cblock != NULL && cblock->name.count > 0) - slotname = QFormatStr("%1[%2]: %3").arg(bind).arg(idx).arg(ToQStr(cblock->name)); + slotname = QFormatStr("%1[%2]: %3").arg(bind).arg(idx).arg(cblock->name); else slotname = QFormatStr("%1[%2]").arg(bind).arg(idx); } @@ -1150,7 +1150,7 @@ void VulkanPipelineStateViewer::addConstantBlockRow(ShaderReflection *shaderDeta BufferDescription *buf = m_Ctx.GetBuffer(descriptorBind->res); if(buf) { - name = ToQStr(buf->name); + name = buf->name; if(length == UINT64_MAX) length = buf->length - descriptorBind->offset; } @@ -1168,7 +1168,7 @@ void VulkanPipelineStateViewer::addConstantBlockRow(ShaderReflection *shaderDeta if(cblock != NULL && !cblock->bufferBacked) { setname = QString(); - slotname = ToQStr(cblock->name); + slotname = cblock->name; name = tr("Push constants"); vecrange = QString(); sizestr = tr("%1 Variables").arg(numvars); @@ -1213,17 +1213,17 @@ void VulkanPipelineStateViewer::setShaderState(const VKPipe::Shader &stage, if(stage.Object == ResourceId()) shader->setText(tr("Unbound Shader")); else - shader->setText(ToQStr(stage.name)); + shader->setText(stage.name); if(shaderDetails != NULL) { - QString entryFunc = ToQStr(shaderDetails->EntryPoint); + QString entryFunc = shaderDetails->EntryPoint; if(shaderDetails->DebugInfo.files.count > 0 || entryFunc != lit("main")) shader->setText(entryFunc + lit("()")); if(shaderDetails->DebugInfo.files.count > 0) shader->setText(entryFunc + lit("() - ") + - QFileInfo(ToQStr(shaderDetails->DebugInfo.files[0].first)).fileName()); + QFileInfo(shaderDetails->DebugInfo.files[0].first).fileName()); } int vs = 0; @@ -1376,7 +1376,7 @@ void VulkanPipelineStateViewer::setShaderState(const VKPipe::Shader &stage, // from SPIR-V side. RDTreeWidgetItem *node = - new RDTreeWidgetItem({QString(), QString(), ToQStr(cblock.name), tr("Push constants"), + new RDTreeWidgetItem({QString(), QString(), cblock.name, tr("Push constants"), QString(), tr("%1 Variables").arg(cblock.variables.count)}); node->setTag(QVariant::fromValue(VulkanCBufferTag(cb, 0))); @@ -1436,15 +1436,15 @@ void VulkanPipelineStateViewer::setState() if(attrib >= 0 && attrib < state.m_VS.ShaderDetails->InputSig.count) { - name = ToQStr(state.m_VS.ShaderDetails->InputSig[attrib].varName); + name = state.m_VS.ShaderDetails->InputSig[attrib].varName; usedSlot = true; } } if(showNode(usedSlot, filledSlot)) { - RDTreeWidgetItem *node = new RDTreeWidgetItem( - {i, name, a.location, a.binding, ToQStr(a.format.strname), a.byteoffset}); + RDTreeWidgetItem *node = + new RDTreeWidgetItem({i, name, a.location, a.binding, a.format.strname, a.byteoffset}); usedBindings[a.binding] = true; @@ -1499,7 +1499,7 @@ void VulkanPipelineStateViewer::setState() if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } @@ -1572,7 +1572,7 @@ void VulkanPipelineStateViewer::setState() BufferDescription *buf = m_Ctx.GetBuffer(vbuff->buffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } } @@ -1744,7 +1744,7 @@ void VulkanPipelineStateViewer::setState() { uint32_t w = 1, h = 1, d = 1; uint32_t a = 1; - QString format = ToQStr(p.viewfmt.strname); + QString format = p.viewfmt.strname; QString name = tr("Texture ") + ToQStr(p.img); QString typeName = tr("Unknown"); @@ -1763,7 +1763,7 @@ void VulkanPipelineStateViewer::setState() h = tex->height; d = tex->depth; a = tex->arraysize; - name = ToQStr(tex->name); + name = tex->name; typeName = ToQStr(tex->resType); if(!tex->customName && state.m_FS.ShaderDetails != NULL) @@ -1774,7 +1774,7 @@ void VulkanPipelineStateViewer::setState() (state.m_FS.ShaderDetails->OutputSig[s].systemValue == ShaderBuiltin::Undefined || state.m_FS.ShaderDetails->OutputSig[s].systemValue == ShaderBuiltin::ColorOutput)) { - name = QFormatStr("<%1>").arg(ToQStr(state.m_FS.ShaderDetails->OutputSig[s].varName)); + name = QFormatStr("<%1>").arg(state.m_FS.ShaderDetails->OutputSig[s].varName); } } } @@ -1957,10 +1957,9 @@ QString VulkanPipelineStateViewer::formatMembers(int indent, const QString &name { if(i > 0) ret += lit("\n"); - ret += indentstr + lit("// struct %1\n").arg(ToQStr(v.type.descriptor.name)); - ret += indentstr + lit("{\n") + - formatMembers(indent + 1, ToQStr(v.name) + lit("_"), v.type.members) + indentstr + - lit("}\n"); + ret += indentstr + lit("// struct %1\n").arg(v.type.descriptor.name); + ret += indentstr + lit("{\n") + formatMembers(indent + 1, v.name + lit("_"), v.type.members) + + indentstr + lit("}\n"); if(i < vars.count - 1) ret += lit("\n"); } @@ -1971,9 +1970,9 @@ QString VulkanPipelineStateViewer::formatMembers(int indent, const QString &name arr = QFormatStr("[%1]").arg(v.type.descriptor.elements); ret += QFormatStr("%1%2 %3%4%5;\n") .arg(indentstr) - .arg(ToQStr(v.type.descriptor.name)) + .arg(v.type.descriptor.name) .arg(nameprefix) - .arg(ToQStr(v.name)) + .arg(v.name) .arg(arr); } @@ -2023,15 +2022,15 @@ void VulkanPipelineStateViewer::resource_itemActivated(RDTreeWidgetItem *item, i ? stage->ShaderDetails->ReadWriteResources[buf.bindPoint] : stage->ShaderDetails->ReadOnlyResources[buf.bindPoint]; - QString format = lit("// struct %1\n").arg(ToQStr(shaderRes.variableType.descriptor.name)); + QString format = lit("// struct %1\n").arg(shaderRes.variableType.descriptor.name); if(shaderRes.variableType.members.count > 1) { format += lit("// members skipped as they are fixed size:\n"); for(int i = 0; i < shaderRes.variableType.members.count - 1; i++) format += QFormatStr("%1 %2;\n") - .arg(ToQStr(shaderRes.variableType.members[i].type.descriptor.name)) - .arg(ToQStr(shaderRes.variableType.members[i].name)); + .arg(shaderRes.variableType.members[i].type.descriptor.name) + .arg(shaderRes.variableType.members[i].name); } if(shaderRes.variableType.members.count > 0) @@ -2055,7 +2054,7 @@ void VulkanPipelineStateViewer::resource_itemActivated(RDTreeWidgetItem *item, i format += desc.cols; if(desc.name.count > 0) - format += lit(" ") + ToQStr(desc.name); + format += lit(" ") + desc.name; if(desc.elements > 1) format += QFormatStr("[%1]").arg(desc.elements); @@ -2293,7 +2292,7 @@ void VulkanPipelineStateViewer::shaderEdit_clicked() GUIInvoke::call([this, stage, shaderDetails, entryFunc, mainfile, disasm]() { QStringMap fileMap; - fileMap[mainfile] = ToQStr(disasm); + fileMap[mainfile] = disasm; m_Common.EditShader(stage->stage, stage->Object, shaderDetails, entryFunc, fileMap, mainfile); }); @@ -2414,7 +2413,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Vertex QList rows; for(const VKPipe::VertexAttribute &attr : vi.attrs) - rows.push_back({attr.location, attr.binding, ToQStr(attr.format.strname), attr.byteoffset}); + rows.push_back({attr.location, attr.binding, attr.format.strname, attr.byteoffset}); m_Common.exportHTMLTable(xml, {tr("Location"), tr("Binding"), tr("Format"), tr("Offset")}, rows); } @@ -2455,7 +2454,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Vertex BufferDescription *buf = m_Ctx.GetBuffer(vb.buffer); if(buf) { - name = ToQStr(buf->name); + name = buf->name; length = buf->length; } } @@ -2484,7 +2483,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::InputA if(ib) { - name = ToQStr(ib->name); + name = ib->name; length = ib->length; } @@ -2522,17 +2521,17 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader if(sh.Object == ResourceId()) shadername = tr("Unbound"); else - shadername = ToQStr(sh.name); + shadername = sh.name; if(shaderDetails) { - QString entryFunc = ToQStr(shaderDetails->EntryPoint); + QString entryFunc = shaderDetails->EntryPoint; if(entryFunc != lit("main")) shadername = QFormatStr("%1()").arg(entryFunc); else if(shaderDetails->DebugInfo.files.count > 0) shadername = QFormatStr("%1() - %2") .arg(entryFunc) - .arg(QFileInfo(ToQStr(shaderDetails->DebugInfo.files[0].first)).fileName()); + .arg(QFileInfo(shaderDetails->DebugInfo.files[0].first).fileName()); } xml.writeStartElement(lit("p")); @@ -2570,7 +2569,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader QString setname = QString::number(bindMap.bindset); - QString slotname = QFormatStr("%1: %2").arg(bindMap.bind).arg(ToQStr(b.name)); + QString slotname = QFormatStr("%1: %2").arg(bindMap.bind).arg(b.name); for(uint32_t a = 0; a < bind.descriptorCount; a++) { @@ -2579,7 +2578,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader ResourceId id = bind.binds[a].res; if(bindMap.arraySize > 1) - slotname = QFormatStr("%1: %2[%3]").arg(bindMap.bind).arg(ToQStr(b.name)).arg(a); + slotname = QFormatStr("%1: %2[%3]").arg(bindMap.bind).arg(b.name).arg(a); QString name; uint64_t byteOffset = descriptorBind.offset; @@ -2595,7 +2594,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader BufferDescription *buf = m_Ctx.GetBuffer(id); if(buf) { - name = ToQStr(buf->name); + name = buf->name; if(length == UINT64_MAX) length = buf->length - byteOffset; @@ -2608,7 +2607,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader if(!b.bufferBacked) { setname = QString(); - slotname = ToQStr(b.name); + slotname = b.name; name = tr("Push constants"); byteOffset = 0; length = 0; @@ -2650,7 +2649,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader QString setname = QString::number(bindMap.bindset); - QString slotname = QFormatStr("%1: %2").arg(bindMap.bind).arg(ToQStr(b.name)); + QString slotname = QFormatStr("%1: %2").arg(bindMap.bind).arg(b.name); for(uint32_t a = 0; a < bind.descriptorCount; a++) { @@ -2659,7 +2658,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader ResourceId id = bind.binds[a].res; if(bindMap.arraySize > 1) - slotname = QFormatStr("%1: %2[%3]").arg(bindMap.bind).arg(ToQStr(b.name)).arg(a); + slotname = QFormatStr("%1: %2[%3]").arg(bindMap.bind).arg(b.name).arg(a); QString name; @@ -2668,11 +2667,11 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader BufferDescription *buf = m_Ctx.GetBuffer(id); if(buf) - name = ToQStr(buf->name); + name = buf->name; TextureDescription *tex = m_Ctx.GetTexture(id); if(tex) - name = ToQStr(tex->name); + name = tex->name; if(name.isEmpty()) name = tr("Resource %1").arg(ToQStr(descriptorBind.res)); @@ -2689,8 +2688,8 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader h = tex->height; d = tex->depth; arr = tex->arraysize; - format = ToQStr(tex->format.strname); - name = ToQStr(tex->name); + format = tex->format.strname; + name = tex->name; if(tex->mips > 1) { @@ -2716,7 +2715,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader d = 0; a = 0; format = lit("-"); - name = ToQStr(buf->name); + name = buf->name; uint64_t length = descriptorBind.size; @@ -2774,7 +2773,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader QString setname = QString::number(bindMap.bindset); - QString slotname = QFormatStr("%1: %2").arg(bindMap.bind).arg(ToQStr(b.name)); + QString slotname = QFormatStr("%1: %2").arg(bindMap.bind).arg(b.name); for(uint32_t a = 0; a < bind.descriptorCount; a++) { @@ -2783,7 +2782,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader ResourceId id = bind.binds[a].res; if(bindMap.arraySize > 1) - slotname = QFormatStr("%1: %2[%3]").arg(bindMap.bind).arg(ToQStr(b.name)).arg(a); + slotname = QFormatStr("%1: %2[%3]").arg(bindMap.bind).arg(b.name).arg(a); QString name; @@ -2792,11 +2791,11 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader BufferDescription *buf = m_Ctx.GetBuffer(id); if(buf) - name = ToQStr(buf->name); + name = buf->name; TextureDescription *tex = m_Ctx.GetTexture(id); if(tex) - name = ToQStr(tex->name); + name = tex->name; if(name.isEmpty()) name = tr("Resource %1").arg(ToQStr(descriptorBind.res)); @@ -2813,8 +2812,8 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader h = tex->height; d = tex->depth; arr = tex->arraysize; - format = ToQStr(tex->format.strname); - name = ToQStr(tex->name); + format = tex->format.strname; + name = tex->name; if(tex->mips > 1) { @@ -2840,7 +2839,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader d = 0; a = 0; format = lit("-"); - name = ToQStr(buf->name); + name = buf->name; uint64_t length = descriptorBind.size; @@ -3077,7 +3076,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Curren QString name = tr("Image %1").arg(ToQStr(a.img)); if(tex) - name = ToQStr(tex->name); + name = tex->name; rows.push_back({i, name, a.baseMip, a.numMip, a.baseLayer, a.numLayer}); diff --git a/qrenderdoc/Windows/PixelHistoryView.cpp b/qrenderdoc/Windows/PixelHistoryView.cpp index 16bf24464..79e57edda 100644 --- a/qrenderdoc/Windows/PixelHistoryView.cpp +++ b/qrenderdoc/Windows/PixelHistoryView.cpp @@ -211,7 +211,7 @@ public: if(!drawstack.isEmpty()) { - ret += lit("> ") + ToQStr(drawstack.back()->name); + ret += lit("> ") + drawstack.back()->name; if(drawstack.count() > 3) ret += lit(" ..."); @@ -219,9 +219,9 @@ public: ret += lit("\n"); if(drawstack.count() > 2) - ret += lit("> ") + ToQStr(drawstack[1]->name) + lit("\n"); + ret += lit("> ") + drawstack[1]->name + lit("\n"); if(drawstack.count() > 1) - ret += lit("> ") + ToQStr(drawstack[0]->name) + lit("\n"); + ret += lit("> ") + drawstack[0]->name + lit("\n"); ret += lit("\n"); } @@ -233,7 +233,7 @@ public: { ret += tr("EID %1\n%2\nBound as UAV or copy - potential modification") .arg(mods.front().eventID) - .arg(ToQStr(drawcall->name)); + .arg(drawcall->name); if(memcmp(mods[0].preMod.col.value_u, mods[0].postMod.col.value_u, sizeof(uint32_t) * 4) == 0) @@ -252,7 +252,7 @@ public: ret += tr("EID %1\n%2%3\n%4 Fragments touching pixel\n") .arg(mods.front().eventID) - .arg(ToQStr(drawcall->name)) + .arg(drawcall->name) .arg(failure) .arg(mods.count()); } @@ -568,8 +568,7 @@ PixelHistoryView::PixelHistoryView(ICaptureContext &ctx, ResourceId id, QPoint p TextureDescription *tex = m_Ctx.GetTexture(id); - QString title = - tr("Pixel History on %1 for (%2, %3)").arg(ToQStr(tex->name)).arg(point.x()).arg(point.y()); + QString title = tr("Pixel History on %1 for (%2, %3)").arg(tex->name).arg(point.x()).arg(point.y()); if(tex->msSamp > 1) title += tr(" @ Sample %1").arg(display.sampleIdx); setWindowTitle(title); diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp index 8629e58a2..88406f29c 100644 --- a/qrenderdoc/Windows/ShaderViewer.cpp +++ b/qrenderdoc/Windows/ShaderViewer.cpp @@ -313,7 +313,7 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR GUIInvoke::call([this, targets, disasm]() { QStringList targetNames; for(const rdctype::str &t : targets) - targetNames << ToQStr(t); + targetNames << t; m_DisassemblyType->addItems(targetNames); m_DisassemblyType->setCurrentIndex(0); @@ -356,17 +356,17 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR if(shader && shader->DebugInfo.files.count > 0) { if(trace) - setWindowTitle(QFormatStr("Debug %1() - %2").arg(ToQStr(shader->EntryPoint)).arg(debugContext)); + setWindowTitle(QFormatStr("Debug %1() - %2").arg(shader->EntryPoint).arg(debugContext)); else - setWindowTitle(ToQStr(shader->EntryPoint)); + setWindowTitle(shader->EntryPoint); int fileIdx = 0; QWidget *sel = NULL; for(auto &f : shader->DebugInfo.files) { - QString name = QFileInfo(ToQStr(f.first)).fileName(); - QString text = ToQStr(f.second); + QString name = QFileInfo(f.first).fileName(); + QString text = f.second; ScintillaEdit *scintilla = AddFileScintilla(name, text); @@ -508,10 +508,10 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR for(const SigParameter &s : shader->InputSig) { QString name = s.varName.count == 0 - ? ToQStr(s.semanticName) - : QFormatStr("%1 (%2)").arg(ToQStr(s.varName)).arg(ToQStr(s.semanticName)); + ? s.semanticName + : QFormatStr("%1 (%2)").arg(s.varName).arg(s.semanticName); if(s.semanticName.count == 0) - name = ToQStr(s.varName); + name = s.varName; QString semIdx = s.needSemanticIndex ? QString::number(s.semanticIndex) : QString(); @@ -533,10 +533,10 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR for(const SigParameter &s : shader->OutputSig) { QString name = s.varName.count == 0 - ? ToQStr(s.semanticName) - : QFormatStr("%1 (%2)").arg(ToQStr(s.varName)).arg(ToQStr(s.semanticName)); + ? s.semanticName + : QFormatStr("%1 (%2)").arg(s.varName).arg(s.semanticName); if(s.semanticName.count == 0) - name = ToQStr(s.varName); + name = s.varName; if(multipleStreams) name = QFormatStr("Stream %1 : %2").arg(s.stream).arg(name); @@ -1019,7 +1019,7 @@ RDTreeWidgetItem *ShaderViewer::makeResourceRegister(const BindpointMap &bind, u const BoundResource &bound, const ShaderResource &res) { - QString name = QFormatStr(" (%1)").arg(ToQStr(res.name)); + QString name = QFormatStr(" (%1)").arg(res.name); const TextureDescription *tex = m_Ctx.GetTexture(bound.Id); const BufferDescription *buf = m_Ctx.GetBuffer(bound.Id); @@ -1053,14 +1053,14 @@ RDTreeWidgetItem *ShaderViewer::makeResourceRegister(const BindpointMap &bind, u .arg(tex->height) .arg(tex->depth > 1 ? tex->depth : tex->arraysize) .arg(tex->mips) - .arg(ToQStr(tex->format.strname)) - .arg(ToQStr(tex->name)); + .arg(tex->format.strname) + .arg(tex->name); return new RDTreeWidgetItem({regname + name, lit("Texture"), type}); } else if(buf) { - QString type = QFormatStr("%1 - %2").arg(buf->length).arg(ToQStr(buf->name)); + QString type = QFormatStr("%1 - %2").arg(buf->length).arg(buf->name); return new RDTreeWidgetItem({regname + name, lit("Buffer"), type}); } @@ -1136,7 +1136,7 @@ void ShaderViewer::updateDebugging() if(m_Trace->cbuffers[i][j].rows > 0 || m_Trace->cbuffers[i][j].columns > 0) { RDTreeWidgetItem *node = - new RDTreeWidgetItem({ToQStr(m_Trace->cbuffers[i][j].name), lit("cbuffer"), + new RDTreeWidgetItem({m_Trace->cbuffers[i][j].name, lit("cbuffer"), stringRep(m_Trace->cbuffers[i][j], false)}); node->setTag(QVariant::fromValue(VariableTag(VariableCategory::Constants, j, i))); @@ -1152,7 +1152,7 @@ void ShaderViewer::updateDebugging() if(input.rows > 0 || input.columns > 0) { RDTreeWidgetItem *node = new RDTreeWidgetItem( - {ToQStr(input.name), ToQStr(input.type) + lit(" input"), stringRep(input, true)}); + {input.name, ToQStr(input.type) + lit(" input"), stringRep(input, true)}); node->setTag(QVariant::fromValue(VariableTag(VariableCategory::Inputs, i))); ui->constants->addTopLevelItem(node); @@ -1184,7 +1184,7 @@ void ShaderViewer::updateDebugging() else { RDTreeWidgetItem *node = - new RDTreeWidgetItem({ToQStr(m_ShaderDetails->ReadWriteResources[i].name), + new RDTreeWidgetItem({m_ShaderDetails->ReadWriteResources[i].name, QFormatStr("[%1]").arg(bind.arraySize), QString()}); for(uint32_t a = 0; a < bind.arraySize; a++) @@ -1215,7 +1215,7 @@ void ShaderViewer::updateDebugging() else { RDTreeWidgetItem *node = - new RDTreeWidgetItem({ToQStr(m_ShaderDetails->ReadOnlyResources[i].name), + new RDTreeWidgetItem({m_ShaderDetails->ReadOnlyResources[i].name, QFormatStr("[%1]").arg(bind.arraySize), QString()}); for(uint32_t a = 0; a < bind.arraySize; a++) @@ -1239,21 +1239,21 @@ void ShaderViewer::updateDebugging() { for(int i = 0; i < state.registers.count; i++) ui->variables->addTopLevelItem( - new RDTreeWidgetItem({ToQStr(state.registers[i].name), lit("temporary"), QString()})); + new RDTreeWidgetItem({state.registers[i].name, lit("temporary"), QString()})); for(int i = 0; i < state.indexableTemps.count; i++) { RDTreeWidgetItem *node = new RDTreeWidgetItem({QFormatStr("x%1").arg(i), lit("indexable"), QString()}); for(int t = 0; t < state.indexableTemps[i].count; t++) - node->addChild(new RDTreeWidgetItem( - {ToQStr(state.indexableTemps[i][t].name), lit("indexable"), QString()})); + node->addChild( + new RDTreeWidgetItem({state.indexableTemps[i][t].name, lit("indexable"), QString()})); ui->variables->addTopLevelItem(node); } for(int i = 0; i < state.outputs.count; i++) ui->variables->addTopLevelItem( - new RDTreeWidgetItem({ToQStr(state.outputs[i].name), lit("output"), QString()})); + new RDTreeWidgetItem({state.outputs[i].name, lit("output"), QString()})); } ui->variables->setUpdatesEnabled(false); @@ -1974,7 +1974,7 @@ void ShaderViewer::updateVariableTooltip() const rdctype::array *vars = GetVariableList(m_TooltipVarCat, m_TooltipArrayIdx); const ShaderVariable &var = vars->elems[m_TooltipVarIdx]; - QString text = QFormatStr("
%1\n").arg(ToQStr(var.name));
+  QString text = QFormatStr("
%1\n").arg(var.name);
   text +=
       lit("                 X          Y          Z          W \n"
           "----------------------------------------------------\n");
diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index 75374cf74..392c0fb29 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -363,7 +363,7 @@ public:
       {
         if(filter.isEmpty())
           texs.push_back(t);
-        else if(ToQStr(t.name).contains(filter, Qt::CaseInsensitive))
+        else if(QString(t.name).contains(filter, Qt::CaseInsensitive))
           texs.push_back(t);
       }
     }
@@ -397,7 +397,7 @@ public:
       if(role == Qt::DisplayRole)
       {
         if(index.row() >= 0 && index.row() < texs.count())
-          return ToQStr(texs[index.row()].name);
+          return texs[index.row()].name;
       }
 
       if(role == Qt::UserRole)
@@ -971,9 +971,9 @@ void TextureViewer::UI_UpdateTextureDetails()
       QString name;
 
       if(followtex)
-        name = ToQStr(followtex->name);
+        name = followtex->name;
       else
-        name = ToQStr(followbuf->name);
+        name = followbuf->name;
 
       switch(m_Following.Type)
       {
@@ -1009,7 +1009,7 @@ void TextureViewer::UI_UpdateTextureDetails()
     ui->renderContainer->setWindowTitle(title);
   }
 
-  status = ToQStr(current.name) + lit(" - ");
+  status = current.name + lit(" - ");
 
   if(current.dimension >= 1)
     status += QString::number(current.width);
@@ -1696,7 +1696,7 @@ void TextureViewer::ViewTexture(ResourceId ID, bool focus)
   if(tex)
   {
     QWidget *lockedContainer = new QWidget(this);
-    lockedContainer->setWindowTitle(ToQStr(tex->name));
+    lockedContainer->setWindowTitle(tex->name);
     lockedContainer->setProperty("id", QVariant::fromValue(ID));
 
     ToolWindowManagerArea *textureTabs = ui->dockarea->areaOf(ui->renderContainer);
@@ -1916,10 +1916,10 @@ void TextureViewer::InitResourcePreview(ResourcePreview *prev, ResourceId id, Co
       {
         if(!fullname.isEmpty())
           fullname += lit(" = ");
-        fullname += ToQStr(texptr->name);
+        fullname += texptr->name;
       }
       if(fullname.isEmpty())
-        fullname = ToQStr(texptr->name);
+        fullname = texptr->name;
 
       prev->setResourceName(fullname);
       WId handle = prev->thumbWinId();
@@ -1935,10 +1935,10 @@ void TextureViewer::InitResourcePreview(ResourcePreview *prev, ResourceId id, Co
       {
         if(!fullname.isEmpty())
           fullname += lit(" = ");
-        fullname += ToQStr(bufptr->name);
+        fullname += bufptr->name;
       }
       if(fullname.isEmpty())
-        fullname = ToQStr(bufptr->name);
+        fullname = bufptr->name;
 
       prev->setResourceName(fullname);
       WId handle = prev->thumbWinId();
@@ -2016,7 +2016,7 @@ void TextureViewer::InitStageResourcePreviews(ShaderStage stage,
         const ShaderResource &bind = resourceDetails[b];
         if(bind.bindPoint == idx && bind.IsReadOnly)
         {
-          bindName = ToQStr(bind.name);
+          bindName = bind.name;
           otherBind = true;
           break;
         }
@@ -3611,7 +3611,7 @@ void TextureViewer::reloadCustomShaders(const QString &filter)
           if(m_CustomShaderEditor.contains(key))
           {
             IShaderViewer *editor = m_CustomShaderEditor[key];
-            GUIInvoke::call([editor, errors]() { editor->ShowErrors(ToQStr(errors)); });
+            GUIInvoke::call([editor, errors]() { editor->ShowErrors(errors); });
           }
 
           GUIInvoke::call([this, fn, key, id]() {
diff --git a/qrenderdoc/Windows/TimelineBar.cpp b/qrenderdoc/Windows/TimelineBar.cpp
index deaf74733..6325cf6cf 100644
--- a/qrenderdoc/Windows/TimelineBar.cpp
+++ b/qrenderdoc/Windows/TimelineBar.cpp
@@ -78,12 +78,12 @@ void TimelineBar::HighlightResourceUsage(ResourceId id)
   TextureDescription *tex = m_Ctx.GetTexture(id);
 
   if(tex)
-    m_UsageTarget = ToQStr(tex->name);
+    m_UsageTarget = tex->name;
 
   BufferDescription *buf = m_Ctx.GetBuffer(id);
 
   if(buf)
-    m_UsageTarget = ToQStr(buf->name);
+    m_UsageTarget = buf->name;
 
   m_Ctx.Replay().AsyncInvoke([this, id](IReplayController *r) {
     rdctype::array usage = r->GetUsage(id);
@@ -108,12 +108,12 @@ void TimelineBar::HighlightHistory(ResourceId id, const QList
     TextureDescription *tex = m_Ctx.GetTexture(id);
 
     if(tex)
-      m_HistoryTarget = ToQStr(tex->name);
+      m_HistoryTarget = tex->name;
 
     BufferDescription *buf = m_Ctx.GetBuffer(id);
 
     if(buf)
-      m_HistoryTarget = ToQStr(buf->name);
+      m_HistoryTarget = buf->name;
 
     for(const PixelModification &mod : history)
       m_HistoryEvents << mod;
@@ -939,7 +939,7 @@ uint32_t TimelineBar::processDraws(QVector &markers, QVector &
       markers.push_back(Marker());
       Marker &m = markers.back();
 
-      m.name = ToQStr(d.name);
+      m.name = d.name;
       m.eidStart = d.eventID;
       m.eidEnd = processDraws(m.children, m.draws, d.children);
 
diff --git a/renderdoc/api/replay/basic_types.h b/renderdoc/api/replay/basic_types.h
index 68590c883..bf3fb8fe1 100644
--- a/renderdoc/api/replay/basic_types.h
+++ b/renderdoc/api/replay/basic_types.h
@@ -264,6 +264,7 @@ struct str : public rdctype::array
 
 #if defined(RENDERDOC_QT_COMPAT)
   operator QString() const { return QString::fromUtf8(elems, count); }
+  operator QVariant() const { return QVariant(QString::fromUtf8(elems, count)); }
 #endif
 
   operator std::string() const { return std::string(elems, elems + count); }