Only consider "included" inputs when defining POSITION_VAR, PRIM_VAR

Fixes D3D12 debugging when a PS includes SV_PrimitiveID

Author: Zorro666

renderdoc/driver/shaders/dxbc/dx_debug.cpp

@@ -303,10 +303,13 @@ void GatherPSInputDataForInitialValues(const DXBC::DXBCContainer *dxbc,
     fetcher.hlsl += " : " + name;
     // DXIL does not allow redeclaring SV_ variables, any that we might need which could already be
     // in PSInput must be obtained from there and not redeclared in our entry point
-    if(sig.systemValue == ShaderBuiltin::Position)
-      defines += "#define POSITION_VAR " + inputName + "\n";
-    else if(sig.systemValue == ShaderBuiltin::PrimitiveIndex)
-      defines += "#define PRIM_VAR " + inputName + "\n";
+    if(included)
+    {
+      if(sig.systemValue == ShaderBuiltin::Position)
+        defines += "#define POSITION_VAR " + inputName + "\n";
+      else if(sig.systemValue == ShaderBuiltin::PrimitiveIndex)
+        defines += "#define PRIM_VAR " + inputName + "\n";
+    }
 
     inputVarNames[i] = inputName;
     if(arrayLength > 0)
@@ -446,7 +449,7 @@ void ExtractInputsPS(PSInput IN,
 #if USEPRIM && !defined(PRIM_VAR)
                      uint primitive : SV_PrimitiveID,
 #endif
-                     // sample, coverage and isFrontFace are deliberately omittted from the
+                     // sample, coverage and isFrontFace are deliberately omitted from the
                      // IN struct for SV_ ordering reasons
                      uint sample : SV_SampleIndex,
                      uint coverage : SV_Coverage,