vkd3d-shader/ir: Separate VKD3DSPR_OUTPUT and VKD3DSPR_TEXCRDOUT.

This simplifies the IR.
This commit is contained in:
Elizabeth Figura
2024-07-20 12:26:56 -05:00
committed by Henri Verbeet
parent 8132239ed2
commit 3c53293028
Notes: Henri Verbeet 2024-12-18 17:39:58 +01:00
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1322
4 changed files with 14 additions and 21 deletions

View File

@@ -387,6 +387,7 @@ static const char * const shader_register_names[] =
[VKD3DSPR_NULL ] = "null",
[VKD3DSPR_OUTCONTROLPOINT ] = "vocp",
[VKD3DSPR_OUTPOINTID ] = "vOutputControlPointID",
[VKD3DSPR_OUTPUT ] = "o",
[VKD3DSPR_OUTSTENCILREF ] = "oStencilRef",
[VKD3DSPR_PARAMETER ] = "parameter",
[VKD3DSPR_PATCHCONST ] = "vpc",
@@ -401,6 +402,7 @@ static const char * const shader_register_names[] =
[VKD3DSPR_STREAM ] = "m",
[VKD3DSPR_TEMP ] = "r",
[VKD3DSPR_TESSCOORD ] = "vDomainLocation",
[VKD3DSPR_TEXCRDOUT ] = "oT",
[VKD3DSPR_TEXTURE ] = "t",
[VKD3DSPR_THREADGROUPID ] = "vThreadGroupID",
[VKD3DSPR_THREADID ] = "vThreadID",
@@ -1010,15 +1012,6 @@ static void shader_print_register(struct vkd3d_d3d_asm_compiler *compiler, const
vkd3d_string_buffer_printf(buffer, "%s", rastout_reg_names[offset]);
break;
case VKD3DSPR_TEXCRDOUT:
/* Vertex shaders >= 3.0 use general purpose output registers
* (VKD3DSPR_OUTPUT), which can include an address token. */
if (vkd3d_shader_ver_ge(&compiler->shader_version, 3, 0))
vkd3d_string_buffer_printf(buffer, "o");
else
vkd3d_string_buffer_printf(buffer, "oT");
break;
case VKD3DSPR_MISCTYPE:
if (offset > 1)
vkd3d_string_buffer_printf(buffer, "%s<unhandled misctype %#x>%s",