From aabea300125027b05a833f75acce6b42835d2178 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 13 Sep 2017 14:24:48 +0100
Subject: [PATCH] Add alpha2coverage to VK state view, move it & alpha2one to
 MSAA group

---
 .../VulkanPipelineStateViewer.cpp             |  3 +-
 .../VulkanPipelineStateViewer.ui              | 97 ++++++++++---------
 2 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
index 457b7382c..7c7c40a13 100644
--- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
@@ -1759,6 +1759,8 @@ void VulkanPipelineStateViewer::setState()
   ui->sampleShading->setPixmap(state.MSAA.sampleShadingEnable ? tick : cross);
   ui->minSampleShading->setText(Formatter::Format(state.MSAA.minSampleShading));
   ui->sampleMask->setText(Formatter::Format(state.MSAA.sampleMask, true));
+  ui->alphaToOne->setPixmap(state.CB.alphaToOneEnable ? tick : cross);
+  ui->alphaToCoverage->setPixmap(state.CB.alphaToCoverageEnable ? tick : cross);
 
   ////////////////////////////////////////////////
   // Output Merger
@@ -1935,7 +1937,6 @@ void VulkanPipelineStateViewer::setState()
                                .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);
 
   ui->depthEnabled->setPixmap(state.DS.depthTestEnable ? tick : cross);
   ui->depthFunc->setText(ToQStr(state.DS.depthCompareOp));
diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
index 79026fc29..1f714a7f6 100644
--- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
@@ -2162,22 +2162,6 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <spacer name="MSAAVSpacer">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Preferred</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>0</width>
-              <height>0</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
           <item row="0" column="3">
            <widget class="QLabel" name="sampleShading">
             <property name="text">
@@ -2210,6 +2194,58 @@
             </property>
            </spacer>
           </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="alphaToOneLabel">
+            <property name="text">
+             <string>Alpha to 1:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLabel" name="alphaToOne">
+            <property name="pixmap">
+             <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+            <property name="margin">
+             <number>4</number>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2">
+           <widget class="QLabel" name="alphaToCoverageLabel">
+            <property name="text">
+             <string>Alpha to Coverage:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="3">
+           <widget class="QLabel" name="alphaToCoverage">
+            <property name="pixmap">
+             <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+            <property name="margin">
+             <number>4</number>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -2755,35 +2791,6 @@
                 </property>
                </widget>
               </item>
-              <item row="2" column="0">
-               <widget class="QLabel" name="alphaToOneLabel">
-                <property name="text">
-                 <string>Alpha to 1:</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="wordWrap">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QLabel" name="alphaToOne">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="pixmap">
-                 <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>4</number>
-                </property>
-               </widget>
-              </item>
              </layout>
             </widget>
            </item>