Józef Kucia : vkd3d-shader: Avoid generating debug names for hull shader SPIR-V built-ins.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 1f8cde763a565c1c973f96edf14b6e98cd0e3b1e
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=1f8cde763a565c1c973f96ed...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Tue May 14 13:27:37 2019 +0200

vkd3d-shader: Avoid generating debug names for hull shader SPIR-V built-ins.

SPIRV Tools disassembler generates pretty names for SPIR-V built-ins.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 libs/vkd3d-shader/spirv.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index f0b7c5b..84fcb6a 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -2436,17 +2436,11 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf
         case VKD3DSPR_COLOROUT:
             snprintf(buffer, buffer_size, "o%u", idx);
             break;
-        case VKD3DSPR_OUTPOINTID:
-            snprintf(buffer, buffer_size, "vOutputControlPointID");
-            break;
         case VKD3DSPR_DEPTHOUT:
         case VKD3DSPR_DEPTHOUTGE:
         case VKD3DSPR_DEPTHOUTLE:
             snprintf(buffer, buffer_size, "oDepth");
             break;
-        case VKD3DSPR_PRIMID:
-            snprintf(buffer, buffer_size, "vPrim");
-            break;
         case VKD3DSPR_FORKINSTID:
             snprintf(buffer, buffer_size, "vForkInstanceId");
             break;
@@ -2483,6 +2477,10 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf
         case VKD3DSPR_SAMPLEMASK:
             snprintf(buffer, buffer_size, "oMask");
             break;
+        case VKD3DSPR_OUTPOINTID:
+        case VKD3DSPR_PRIMID:
+            /* SPIRV-Tools disassembler generates names for SPIR-V built-ins. */
+            return false;
         default:
             FIXME("Unhandled register %#x.\n", reg->type);
             snprintf(buffer, buffer_size, "unrecognized_%#x", reg->type);