From e3533fb634dd91794aaf8bfaf03969f06e6f80e1 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Fri, 8 Dec 2017 12:59:08 +0100
Subject: [PATCH] [dxbc] Implemented user-defined shader interface

---
 src/dxbc/gen/dxbc_gen_pixel.cpp  | 36 +++++++++++++++++++++++++++++++-
 src/dxbc/gen/dxbc_gen_pixel.h    |  2 ++
 src/dxbc/gen/dxbc_gen_vertex.cpp | 36 +++++++++++++++++++++++++++++++-
 src/dxbc/gen/dxbc_gen_vertex.h   |  2 ++
 4 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/src/dxbc/gen/dxbc_gen_pixel.cpp b/src/dxbc/gen/dxbc_gen_pixel.cpp
index 2bd6c0bc..1dd116dc 100644
--- a/src/dxbc/gen/dxbc_gen_pixel.cpp
+++ b/src/dxbc/gen/dxbc_gen_pixel.cpp
@@ -19,6 +19,19 @@ namespace dxvk {
       spv::FunctionControlMaskNone);
     m_module.opLabel(m_module.allocateId());
     
+    // Declare user input block
+    m_psIn = m_module.newVar(
+      m_module.defPointerType(
+        m_module.defArrayType(
+          m_module.defVectorType(
+            m_module.defFloatType(32), 4),
+          m_module.constu32(32)),
+        spv::StorageClassInput),
+      spv::StorageClassInput);
+    m_entryPointInterfaces.push_back(m_psIn);
+    m_module.decorateLocation(m_psIn, 0);
+    m_module.setDebugName(m_psIn, "ps_in");
+    
     // Declare outputs based on the input signature
     for (auto e = osgn->begin(); e != osgn->end(); e++) {
       if (e->systemValue == DxbcSystemValue::None) {
@@ -154,7 +167,14 @@ namespace dxvk {
   
   
   void DxbcPsCodeGen::prepareSvInputs() {
-    
+    for (uint32_t i = 0; i < m_vRegs.size(); i++) {
+      if (m_vRegs.at(i).valueId != 0) {
+        this->regStore(
+          m_vRegs.at(i),
+          this->regLoad(this->getPsInPtr(i)),
+          DxbcComponentMask(true, true, true, true));
+      }
+    }
   }
   
   
@@ -172,4 +192,18 @@ namespace dxvk {
     }
   }
   
+  
+  DxbcPointer DxbcPsCodeGen::getPsInPtr(uint32_t id) {
+    const uint32_t memberId = m_module.constu32(id);
+    
+    DxbcPointer result;
+    result.type = DxbcPointerType(
+      DxbcValueType(DxbcScalarType::Float32, 4),
+      spv::StorageClassInput);
+    result.valueId = m_module.opAccessChain(
+      this->defPointerType(result.type),
+      m_psIn, 1, &memberId);
+    return result;
+  }
+  
 }
\ No newline at end of file
diff --git a/src/dxbc/gen/dxbc_gen_pixel.h b/src/dxbc/gen/dxbc_gen_pixel.h
index 5433ea8b..b07dc56b 100644
--- a/src/dxbc/gen/dxbc_gen_pixel.h
+++ b/src/dxbc/gen/dxbc_gen_pixel.h
@@ -49,6 +49,8 @@ namespace dxvk {
     void prepareSvInputs();
     void prepareSvOutputs();
     
+    DxbcPointer getPsInPtr(uint32_t id);
+    
   };
   
 }
\ No newline at end of file
diff --git a/src/dxbc/gen/dxbc_gen_vertex.cpp b/src/dxbc/gen/dxbc_gen_vertex.cpp
index 15a76911..6e745deb 100644
--- a/src/dxbc/gen/dxbc_gen_vertex.cpp
+++ b/src/dxbc/gen/dxbc_gen_vertex.cpp
@@ -25,6 +25,19 @@ namespace dxvk {
     m_entryPointInterfaces.push_back(m_vsPerVertex);
     m_module.setDebugName(m_vsPerVertex, "vs_per_vertex");
     
+    // Declare per-vertex user output block
+    m_vsOut = m_module.newVar(
+      m_module.defPointerType(
+        m_module.defArrayType(
+          m_module.defVectorType(
+            m_module.defFloatType(32), 4),
+          m_module.constu32(32)),
+        spv::StorageClassOutput),
+      spv::StorageClassOutput);
+    m_entryPointInterfaces.push_back(m_vsOut);
+    m_module.decorateLocation(m_vsOut, 0);
+    m_module.setDebugName(m_vsOut, "vs_out");
+    
     // Declare vertex inputs based on the input signature
     for (auto e = isgn->begin(); e != isgn->end(); e++) {
       if (e->systemValue == DxbcSystemValue::None) {
@@ -172,7 +185,14 @@ namespace dxvk {
   
   
   void DxbcVsCodeGen::prepareSvOutputs() {
-    // TODO add user-defined shader outputs
+    for (uint32_t i = 0; i < m_oRegs.size(); i++) {
+      if (m_oRegs.at(i).valueId != 0) {
+        this->regStore(
+          this->getVsOutPtr(i),
+          this->regLoad(m_oRegs.at(i)),
+          DxbcComponentMask(true, true, true, true));
+      }
+    }
     
     for (const auto& mapping : m_svOut) {
       DxbcValue srcValue = this->regLoad(m_oRegs.at(mapping.regId));
@@ -200,4 +220,18 @@ namespace dxvk {
     return result;
   }
   
+  
+  DxbcPointer DxbcVsCodeGen::getVsOutPtr(uint32_t id) {
+    const uint32_t memberId = m_module.constu32(id);
+    
+    DxbcPointer result;
+    result.type = DxbcPointerType(
+      DxbcValueType(DxbcScalarType::Float32, 4),
+      spv::StorageClassOutput);
+    result.valueId = m_module.opAccessChain(
+      this->defPointerType(result.type),
+      m_vsOut, 1, &memberId);
+    return result;
+  }
+  
 }
\ No newline at end of file
diff --git a/src/dxbc/gen/dxbc_gen_vertex.h b/src/dxbc/gen/dxbc_gen_vertex.h
index 24dd47bd..8d8dac6e 100644
--- a/src/dxbc/gen/dxbc_gen_vertex.h
+++ b/src/dxbc/gen/dxbc_gen_vertex.h
@@ -53,6 +53,8 @@ namespace dxvk {
     
     DxbcPointer ptrBuiltInPosition();
     
+    DxbcPointer getVsOutPtr(uint32_t id);
+    
   };
   
 }
\ No newline at end of file