[dxbc] Implemented interpolation modes for pixel shader inputs

src/dxbc/dxbc_compiler.cpp

@@ -102,8 +102,10 @@ namespace dxvk {
         
         DxbcInterpolationMode im = DxbcInterpolationMode::Undefined;
         
-        if (hasInterpolationMode)
+        if (hasInterpolationMode) {
-          im = op.token().interpolationMode();
+          im = static_cast<DxbcInterpolationMode>(
+            bit::extract(ins.token().control(), 0, 3));
+        }
         
         m_gen->dclInterfaceVar(
           op.token().type(), regId, regDim,

src/dxbc/dxbc_decoder.h

@@ -287,17 +287,6 @@ namespace dxvk {
       return DxbcComponentMask(bit::extract(m_token, 4, 5));
     }
     
-    /**
-     * \brief Interpolatin mode
-     * 
-     * Used by input declarations in pixel shaders.
-     * Undefined for all other instructions.
-     */
-    DxbcInterpolationMode interpolationMode() const {
-      return static_cast<DxbcInterpolationMode>(
-        bit::extract(m_token, 11, 14));
-    }
-    
     /**
      * \brief Operand type
      * 

src/dxbc/dxbc_enums.h

@@ -421,7 +421,7 @@ namespace dxvk {
     Linear                      = 2,
     LinearCentroid              = 3,
     LinearNoPerspective         = 4,
-    LinearNoperspectiveCentroid = 5,
+    LinearNoPerspectiveCentroid = 5,
     LinearSample                = 6,
     LinearNoPerspectiveSample   = 7,
   };

src/dxbc/gen/dxbc_gen_pixel.cpp

@@ -58,6 +58,40 @@ namespace dxvk {
           m_module.decorateLocation(m_vRegs.at(regId).valueId, regId);
           m_module.setDebugName(m_vRegs.at(regId).valueId,
             str::format("v", regId).c_str());
+          
+          switch (im) {
+            case DxbcInterpolationMode::Undefined:
+              Logger::err("Undefined interpolation mode");
+              break;
+            case DxbcInterpolationMode::Linear:
+              Logger::err("Linear interpolation mode");
+              break;
+              
+            case DxbcInterpolationMode::Constant:
+              m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationFlat);
+              break;
+              
+            case DxbcInterpolationMode::LinearCentroid:
+              m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationCentroid);
+              break;
+              
+            case DxbcInterpolationMode::LinearNoPerspective:
+              m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationNoPerspective);
+              break;
+            case DxbcInterpolationMode::LinearNoPerspectiveCentroid:
+              m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationNoPerspective);
+              m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationCentroid);
+              break;
+              
+            case DxbcInterpolationMode::LinearSample:
+              m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationSample);
+              break;
+              
+            case DxbcInterpolationMode::LinearNoPerspectiveSample:
+              m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationNoPerspective);
+              m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationSample);
+              break;
+          }
         }
       } break;
       

src/spirv/spirv_module.cpp

@@ -227,6 +227,15 @@ namespace dxvk {
       m_typeConstDefs.putWord(constIds[i]);
     return resultId;
   }
+    
+  
+  void SpirvModule::decorate(
+          uint32_t                object,
+          spv::Decoration         decoration) {
+    m_annotations.putIns  (spv::OpDecorate, 3);
+    m_annotations.putWord (object);
+    m_annotations.putWord (decoration);
+  }
   
   
   void SpirvModule::decorateBinding(

src/spirv/spirv_module.h

@@ -84,6 +84,10 @@ namespace dxvk {
             uint32_t                constCount,
       const uint32_t*               constIds);
     
+    void decorate(
+            uint32_t                object,
+            spv::Decoration         decoration);
+    
     void decorateBinding(
             uint32_t                object,
             uint32_t                binding);