From 6ee0ef0402711b010911e82a9c8f8764e968f10c Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 25 Jan 2017 12:46:07 +0000 Subject: [PATCH] Fix formatting of hex (to be uppercase) and bools ("true" or "false") --- .../PipelineState/GLPipelineStateViewer.cpp | 28 +++++++++---------- .../VulkanPipelineStateViewer.cpp | 16 +++++------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp index 2a96608f8..d6829cade 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp @@ -1120,7 +1120,7 @@ void GLPipelineStateViewer::setState() ui->primRestart->setVisible(true); if(state.m_VtxIn.primitiveRestart) ui->primRestart->setText( - QString("Restart Idx: 0x%1").arg(state.m_VtxIn.restartIndex, 8, 16, QChar('0'))); + QString("Restart Idx: 0x%1").arg(state.m_VtxIn.restartIndex, 8, 16, QChar('0')).toUpper()); else ui->primRestart->setText("Restart Idx: Disabled"); } @@ -1445,8 +1445,8 @@ void GLPipelineStateViewer::setState() else indexstring = QString::number(prev); - QTreeWidgetItem *node = - makeTreeNode({indexstring, s1.Left, s1.Bottom, s1.Width, s1.Height, s1.Enabled}); + QTreeWidgetItem *node = makeTreeNode({indexstring, s1.Left, s1.Bottom, s1.Width, + s1.Height, s1.Enabled ? tr("True") : tr("False")}); if(s1.Width == 0 || s1.Height == 0) setEmptyRow(node); @@ -1476,8 +1476,8 @@ void GLPipelineStateViewer::setState() else indexstring = QString::number(prev); - QTreeWidgetItem *node = - makeTreeNode({indexstring, s1.Left, s1.Bottom, s1.Width, s1.Height, s1.Enabled}); + QTreeWidgetItem *node = makeTreeNode({indexstring, s1.Left, s1.Bottom, s1.Width, s1.Height, + s1.Enabled ? tr("True") : tr("False")}); if(s1.Width == 0 || s1.Height == 0) setEmptyRow(node); @@ -1582,7 +1582,7 @@ void GLPipelineStateViewer::setState() if(state.m_Rasterizer.m_State.SampleMask) { ui->sampleMask->setText( - QString("%1").arg(state.m_Rasterizer.m_State.SampleMaskValue, 8, 16, QChar('0'))); + QString("%1").arg(state.m_Rasterizer.m_State.SampleMaskValue, 8, 16, QChar('0')).toUpper()); ui->sampleMask->setPixmap(QPixmap()); } else @@ -1785,7 +1785,7 @@ void GLPipelineStateViewer::setState() if(i == 0 && logic) { - node = makeTreeNode({i, true, + node = makeTreeNode({i, tr("True"), "-", "-", ToQStr(blend.LogicOp), @@ -1799,7 +1799,7 @@ void GLPipelineStateViewer::setState() } else { - node = makeTreeNode({i, blend.Enabled, + node = makeTreeNode({i, blend.Enabled ? tr("True") : tr("False"), ToQStr(blend.m_Blend.Source), ToQStr(blend.m_Blend.Destination), ToQStr(blend.m_Blend.Operation), @@ -1863,17 +1863,17 @@ void GLPipelineStateViewer::setState() ToQStr(state.m_StencilState.m_FrontFace.FailOp), ToQStr(state.m_StencilState.m_FrontFace.DepthFailOp), ToQStr(state.m_StencilState.m_FrontFace.PassOp), - QString("%1").arg(state.m_StencilState.m_FrontFace.WriteMask, 2, 16, QChar('0')), - QString("%1").arg(state.m_StencilState.m_FrontFace.ValueMask, 2, 16, QChar('0')), - QString("%1").arg(state.m_StencilState.m_FrontFace.Ref, 2, 16, QChar('0'))}), + QString("%1").arg(state.m_StencilState.m_FrontFace.WriteMask, 2, 16, QChar('0')).toUpper(), + QString("%1").arg(state.m_StencilState.m_FrontFace.ValueMask, 2, 16, QChar('0')).toUpper(), + QString("%1").arg(state.m_StencilState.m_FrontFace.Ref, 2, 16, QChar('0')).toUpper()}), makeTreeNode( {"Back", ToQStr(state.m_StencilState.m_BackFace.Func), ToQStr(state.m_StencilState.m_BackFace.FailOp), ToQStr(state.m_StencilState.m_BackFace.DepthFailOp), ToQStr(state.m_StencilState.m_BackFace.PassOp), - QString("%1").arg(state.m_StencilState.m_BackFace.WriteMask, 2, 16, QChar('0')), - QString("%1").arg(state.m_StencilState.m_BackFace.ValueMask, 2, 16, QChar('0')), - QString("%1").arg(state.m_StencilState.m_BackFace.Ref, 2, 16, QChar('0'))})}); + QString("%1").arg(state.m_StencilState.m_BackFace.WriteMask, 2, 16, QChar('0')).toUpper(), + QString("%1").arg(state.m_StencilState.m_BackFace.ValueMask, 2, 16, QChar('0')).toUpper(), + QString("%1").arg(state.m_StencilState.m_BackFace.Ref, 2, 16, QChar('0')).toUpper()})}); } else { diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp index 19cc5627f..84086f86d 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp @@ -1772,7 +1772,7 @@ void VulkanPipelineStateViewer::setState() ui->sampleCount->setText(QString::number(state.MSAA.rasterSamples)); ui->sampleShading->setPixmap(state.MSAA.sampleShadingEnable ? tick : cross); ui->minSampleShading->setText(Formatter::Format(state.MSAA.minSampleShading)); - ui->sampleMask->setText(QString("%1").arg(state.MSAA.sampleMask, 8, 16, QChar('0'))); + ui->sampleMask->setText(QString("%1").arg(state.MSAA.sampleMask, 8, 16, QChar('0')).toUpper()); //////////////////////////////////////////////// // Output Merger @@ -1896,7 +1896,7 @@ void VulkanPipelineStateViewer::setState() if(showNode(usedSlot, filledSlot)) { QTreeWidgetItem *node = - makeTreeNode({i, blend.blendEnable, + makeTreeNode({i, blend.blendEnable ? tr("True") : tr("False"), ToQStr(blend.blend.Source), ToQStr(blend.blend.Destination), ToQStr(blend.blend.Operation), @@ -1957,14 +1957,14 @@ void VulkanPipelineStateViewer::setState() ui->stencils->addTopLevelItems( {makeTreeNode({"Front", ToQStr(state.DS.front.func), ToQStr(state.DS.front.failOp), ToQStr(state.DS.front.depthFailOp), ToQStr(state.DS.front.passOp), - QString("%1").arg(state.DS.front.writeMask, 2, 16, QChar('0')), - QString("%1").arg(state.DS.front.compareMask, 2, 16, QChar('0')), - QString("%1").arg(state.DS.front.ref, 2, 16, QChar('0'))}), + QString("%1").arg(state.DS.front.writeMask, 2, 16, QChar('0')).toUpper(), + QString("%1").arg(state.DS.front.compareMask, 2, 16, QChar('0')).toUpper(), + QString("%1").arg(state.DS.front.ref, 2, 16, QChar('0')).toUpper()}), makeTreeNode({"Back", ToQStr(state.DS.back.func), ToQStr(state.DS.back.failOp), ToQStr(state.DS.back.depthFailOp), ToQStr(state.DS.back.passOp), - QString("%1").arg(state.DS.back.writeMask, 2, 16, QChar('0')), - QString("%1").arg(state.DS.back.compareMask, 2, 16, QChar('0')), - QString("%1").arg(state.DS.back.ref, 2, 16, QChar('0'))})}); + QString("%1").arg(state.DS.back.writeMask, 2, 16, QChar('0')).toUpper(), + QString("%1").arg(state.DS.back.compareMask, 2, 16, QChar('0')).toUpper(), + QString("%1").arg(state.DS.back.ref, 2, 16, QChar('0')).toUpper()})}); } else {