From 08fa2ec411b5a2c49455e102420281cfe8bae8dc Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 12 May 2017 11:32:27 +0100 Subject: [PATCH] Fix formatting of blend factor in pipeline state --- .../Windows/PipelineState/D3D11PipelineStateViewer.cpp | 8 ++++---- .../Windows/PipelineState/D3D12PipelineStateViewer.cpp | 8 ++++---- .../Windows/PipelineState/GLPipelineStateViewer.cpp | 8 ++++---- .../Windows/PipelineState/VulkanPipelineStateViewer.cpp | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp index 97aca16de..ff53c5ee3 100644 --- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp @@ -1681,10 +1681,10 @@ void D3D11PipelineStateViewer::setState() QFormatStr("%1").arg(state.m_OM.m_BlendState.SampleMask, 8, 16, QLatin1Char('0')).toUpper()); ui->blendFactor->setText(QFormatStr("%1, %2, %3, %4") - .arg(state.m_OM.m_BlendState.BlendFactor[0], 2) - .arg(state.m_OM.m_BlendState.BlendFactor[1], 2) - .arg(state.m_OM.m_BlendState.BlendFactor[2], 2) - .arg(state.m_OM.m_BlendState.BlendFactor[3], 2)); + .arg(state.m_OM.m_BlendState.BlendFactor[0], 0, 'f', 2) + .arg(state.m_OM.m_BlendState.BlendFactor[1], 0, 'f', 2) + .arg(state.m_OM.m_BlendState.BlendFactor[2], 0, 'f', 2) + .arg(state.m_OM.m_BlendState.BlendFactor[3], 0, 'f', 2)); ui->depthEnabled->setPixmap(state.m_OM.m_State.DepthEnable ? tick : cross); ui->depthFunc->setText(ToQStr(state.m_OM.m_State.DepthFunc)); diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp index 2d901c9bd..0cb37596e 100644 --- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp @@ -1643,10 +1643,10 @@ void D3D12PipelineStateViewer::setState() ui->independentBlend->setPixmap(state.m_OM.m_BlendState.IndependentBlend ? tick : cross); ui->blendFactor->setText(QFormatStr("%1, %2, %3, %4") - .arg(state.m_OM.m_BlendState.BlendFactor[0], 2) - .arg(state.m_OM.m_BlendState.BlendFactor[1], 2) - .arg(state.m_OM.m_BlendState.BlendFactor[2], 2) - .arg(state.m_OM.m_BlendState.BlendFactor[3], 2)); + .arg(state.m_OM.m_BlendState.BlendFactor[0], 0, 'f', 2) + .arg(state.m_OM.m_BlendState.BlendFactor[1], 0, 'f', 2) + .arg(state.m_OM.m_BlendState.BlendFactor[2], 0, 'f', 2) + .arg(state.m_OM.m_BlendState.BlendFactor[3], 0, 'f', 2)); ui->depthEnabled->setPixmap(state.m_OM.m_State.DepthEnable ? tick : cross); ui->depthFunc->setText(ToQStr(state.m_OM.m_State.DepthFunc)); diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp index 0759c92b4..8d54451b4 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp @@ -1887,10 +1887,10 @@ void GLPipelineStateViewer::setState() ui->blends->verticalScrollBar()->setValue(vs); ui->blendFactor->setText(QFormatStr("%1, %2, %3, %4") - .arg(state.m_FB.m_Blending.BlendFactor[0], 2) - .arg(state.m_FB.m_Blending.BlendFactor[1], 2) - .arg(state.m_FB.m_Blending.BlendFactor[2], 2) - .arg(state.m_FB.m_Blending.BlendFactor[3], 2)); + .arg(state.m_FB.m_Blending.BlendFactor[0], 0, 'f', 2) + .arg(state.m_FB.m_Blending.BlendFactor[1], 0, 'f', 2) + .arg(state.m_FB.m_Blending.BlendFactor[2], 0, 'f', 2) + .arg(state.m_FB.m_Blending.BlendFactor[3], 0, 'f', 2)); ui->depthEnabled->setPixmap(state.m_DepthState.DepthEnable ? tick : cross); ui->depthFunc->setText(ToQStr(state.m_DepthState.DepthFunc)); diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp index 6ce952696..9913dbd36 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp @@ -1902,10 +1902,10 @@ void VulkanPipelineStateViewer::setState() ui->blends->verticalScrollBar()->setValue(vs); ui->blendFactor->setText(QFormatStr("%1, %2, %3, %4") - .arg(state.CB.blendConst[0], 2) - .arg(state.CB.blendConst[1], 2) - .arg(state.CB.blendConst[2], 2) - .arg(state.CB.blendConst[3], 2)); + .arg(state.CB.blendConst[0], 0, 'f', 2) + .arg(state.CB.blendConst[1], 0, 'f', 2) + .arg(state.CB.blendConst[2], 0, 'f', 2) + .arg(state.CB.blendConst[3], 0, 'f', 2)); ui->logicOp->setText(state.CB.logicOpEnable ? ToQStr(state.CB.logic) : lit("-")); ui->alphaToOne->setPixmap(state.CB.alphaToOneEnable ? tick : cross);