lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 01:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting of hex (to be uppercase) and bools ("true" or "false")

Browse Source
This commit is contained in:
baldurk
2017-01-25 12:46:07 +00:00
parent 21be0f8923
commit 6ee0ef0402
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
+14 -14
View File
@@ -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
{
qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+8 -8
View File
@@ -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
{