[PATCH vkd3d 3/9] vkd3d-shader: Avoid generating debug names for hull shader SPIR-V built-ins.

Józef Kucia joseph.kucia at gmail.com
Tue May 14 06:27:37 CDT 2019


From: Józef Kucia <jkucia at codeweavers.com>

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

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
 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 f0b7c5b918cc..84fcb6a2dcc2 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);
-- 
2.21.0




More information about the wine-devel mailing list